minor #13726 FilesLoader - fix git conflict (keradus)

fabpot · fabpot · commit 584374525852 · 2015-02-18T11:12:30.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- FilesLoader - fix git conflict | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | ? | Fixed tickets | N/A | License | MIT | Doc PR | N/A Commits ------- 5c9835f FilesLoader - fix git conflict
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
@@ -17,13 +17,8 @@
  * @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
 {

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,8 @@`
`17`	`17`	`* @author Bulat Shakirzyanov <mallluhuct@gmail.com>`
`18`	`18`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`19`	`19`	`*`
`20`		`-<<<<<<< HEAD`
`21`		`- * @see YamlFileLoader`
`22`		`- * @see XmlFileLoader`
`23`		`-=======`
`24`	`20`	`* @see YamlFilesLoader`
`25`	`21`	`* @see XmlFilesLoader`
`26`		`->>>>>>> pull/12201`
`27`	`22`	`*/`
`28`	`23`	`abstract class FilesLoader extends LoaderChain`
`29`	`24`	`{`