FilesLoader - fix git conflict

2015-02-18 08:07:05 +01:00 · 2015-02-18 08:07:05 +01:00 · 5c9835f230
parent 1cc1d8d12e
commit 5c9835f230
1 changed files with 0 additions and 5 deletions
--- a/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
@ -17,13 +17,8 @@ namespace Symfony\Component\Validator\Mapping\Loader;
 * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
 * @author Bernhard Schussek <bschussek@gmail.com>
 *
-<<<<<<< HEAD
- * @see YamlFileLoader
- * @see XmlFileLoader
-=======
 * @see YamlFilesLoader
 * @see XmlFilesLoader
->>>>>>> pull/12201
 */
 abstract class FilesLoader extends LoaderChain
 {