diff options
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/README.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Http/README.md b/Http/README.md index e5ee6b1..aaacc14 100644 --- a/Http/README.md +++ b/Http/README.md @@ -9,6 +9,7 @@ the Java Spring framework. Resources --------- +<<<<<<< HEAD Documentation: https://symfony.com/doc/3.1/book/security.html @@ -21,3 +22,10 @@ You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Security/Http/ $ composer.phar install --dev $ phpunit +======= + * [Documentation](https://symfony.com/doc/current/components/security/index.html) + * [Contributing](https://symfony.com/doc/current/contributing/index.html) + * [Report issues](https://github.com/symfony/symfony/issues) and + [send Pull Requests](https://github.com/symfony/symfony/pulls) + in the [main Symfony repository](https://github.com/symfony/symfony) +>>>>>>> 3.0 |