From 5c9835f230ae878a9268d9d2eaae7d585e7ceb36 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Wed, 18 Feb 2015 08:07:05 +0100 Subject: [PATCH] FilesLoader - fix git conflict --- .../Component/Validator/Mapping/Loader/FilesLoader.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php index e82d7ed189..571c7e7abb 100644 --- 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 * @author Bernhard Schussek * -<<<<<<< HEAD - * @see YamlFileLoader - * @see XmlFileLoader -======= * @see YamlFilesLoader * @see XmlFilesLoader ->>>>>>> pull/12201 */ abstract class FilesLoader extends LoaderChain {