summaryrefslogtreecommitdiffstats
path: root/Http/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'Http/README.md')
-rw-r--r--Http/README.md15
1 files changed, 0 insertions, 15 deletions
diff --git a/Http/README.md b/Http/README.md
index aaacc14..5be2111 100644
--- a/Http/README.md
+++ b/Http/README.md
@@ -9,23 +9,8 @@ the Java Spring framework.
Resources
---------
-<<<<<<< HEAD
-Documentation:
-
-https://symfony.com/doc/3.1/book/security.html
-
-Tests
------
-
-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