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:
commit
5843745258
@ -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