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

minor #13726 FilesLoader - fix git conflict (keradus) 

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
This commit is contained in:
Fabien Potencier 2015-02-18 11:12:30 +01:00
parent 1cc1d8d12e 5c9835f230
commit 5843745258
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 Bernhard Schussek <bschussek@gmail.com>
*
<<<<<<< HEAD
* @see YamlFileLoader
* @see XmlFileLoader
=======
* @see YamlFilesLoader
* @see XmlFilesLoader
>>>>>>> pull/12201
*/
abstract class FilesLoader extends LoaderChain
{