FilesLoader - fix git conflict
This commit is contained in:
parent
1cc1d8d12e
commit
5c9835f230
@ -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
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user