Skip to content

Commit d422303

Browse files
Merge branch '3.0'
* 3.0: [ci] use hirak/prestissimo [Filesystem] Fix transient tests [WebProfiler] Sidebar button padding Updated some missing READMEs [HttpFoundation] Avoid warnings when checking malicious IPs [HttpFoundation] Set the Content-Range header if the requested Range is unsatisfied
2 parents ac111ca + 10c937c commit d422303

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

README.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,8 @@ the Java Spring framework.
99
Resources
1010
---------
1111

12-
<<<<<<< HEAD
13-
Documentation:
14-
15-
https://symfony.com/doc/3.1/book/security.html
16-
17-
Tests
18-
-----
19-
20-
You can run the unit tests with the following command:
21-
22-
$ cd path/to/Symfony/Component/Security/Http/
23-
$ composer.phar install --dev
24-
$ phpunit
25-
=======
2612
* [Documentation](https://symfony.com/doc/current/components/security/index.html)
2713
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
2814
* [Report issues](https://github.com/symfony/symfony/issues) and
2915
[send Pull Requests](https://github.com/symfony/symfony/pulls)
3016
in the [main Symfony repository](https://github.com/symfony/symfony)
31-
>>>>>>> 3.0

0 commit comments

Comments
 (0)