diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FilesLoader - fix git conflict

Browse Source
This commit is contained in:
Dariusz Ruminski 2015-02-18 08:07:05 +01:00
parent 1cc1d8d12e
commit 5c9835f230
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
View File

@ -17,13 +17,8 @@ namespace Symfony\Component\Validator\Mapping\Loader;
* @author Bulat Shakirzyanov <mallluhuct@gmail.com> * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
* @author Bernhard Schussek <bschussek@gmail.com> * @author Bernhard Schussek <bschussek@gmail.com>
* *
<<<<<<< HEAD
* @see YamlFileLoader
* @see XmlFileLoader
=======
* @see YamlFilesLoader * @see YamlFilesLoader
* @see XmlFilesLoader * @see XmlFilesLoader
>>>>>>> pull/12201
*/ */
abstract class FilesLoader extends LoaderChain abstract class FilesLoader extends LoaderChain
{ {