symfony/symfony — comment on commit 5b2bc7d7f9596d0da3a8cea852dd7e9ca2eb4f2f
File: src/Symfony/Component/HttpFoundation/File/File.php line 448
By stloyd:

Merge failed.