symfony
diff --git a/‎src/Symfony/Component/Finder/Finder.php
Lines changed: 6 additions & 38 deletions b/‎src/Symfony/Component/Finder/Finder.php
Lines changed: 6 additions & 38 deletions
@@ -158,16 +158,10 @@ public function date($dates)
      *
      * You can use patterns (delimited with / sign), globs or simple strings.
      *
-<<<<<<< HEAD
-     * $finder->name('*.php')
-     * $finder->name('/\.php$/') // same as above
-     * $finder->name('test.php')
-     * $finder->name(['test.py', 'test.php'])
-=======
      *     $finder->name('*.php')
      *     $finder->name('/\.php$/') // same as above
      *     $finder->name('test.php')
->>>>>>> 4.1
+     *     $finder->name(['test.py', 'test.php'])
      *
      * @param string|string[] $patterns A pattern (a regexp, a glob, or a string) or an array of patterns
      *
@@ -203,14 +197,9 @@ public function notName($patterns)
      *
      * Strings or PCRE patterns can be used:
      *
-<<<<<<< HEAD
-     * $finder->contains('Lorem ipsum')
-     * $finder->contains('/Lorem ipsum/i')
-     * $finder->contains(['dolor', '/ipsum/i'])
-=======
      *     $finder->contains('Lorem ipsum')
      *     $finder->contains('/Lorem ipsum/i')
->>>>>>> 4.1
+     *     $finder->contains(['dolor', '/ipsum/i'])
      *
      * @param string|string[] $patterns A pattern (string or regexp) or an array of patterns
      *
@@ -230,14 +219,9 @@ public function contains($patterns)
      *
      * Strings or PCRE patterns can be used:
      *
-<<<<<<< HEAD
-     * $finder->notContains('Lorem ipsum')
-     * $finder->notContains('/Lorem ipsum/i')
-     * $finder->notContains(['lorem', '/dolor/i'])
-=======
      *     $finder->notContains('Lorem ipsum')
      *     $finder->notContains('/Lorem ipsum/i')
->>>>>>> 4.1
+     *     $finder->notContains(['lorem', '/dolor/i'])
      *
      * @param string|string[] $patterns A pattern (string or regexp) or an array of patterns
      *
@@ -257,14 +241,9 @@ public function notContains($patterns)
      *
      * You can use patterns (delimited with / sign) or simple strings.
      *
-<<<<<<< HEAD
-     * $finder->path('some/special/dir')
-     * $finder->path('/some\/special\/dir/') // same as above
-     * $finder->path(['some dir', 'another/dir'])
-=======
      *     $finder->path('some/special/dir')
      *     $finder->path('/some\/special\/dir/') // same as above
->>>>>>> 4.1
+     *     $finder->path(['some dir', 'another/dir'])
      *
      * Use only / as dirname separator.
      *
@@ -286,14 +265,9 @@ public function path($patterns)
      *
      * You can use patterns (delimited with / sign) or simple strings.
      *
-<<<<<<< HEAD
-     * $finder->notPath('some/special/dir')
-     * $finder->notPath('/some\/special\/dir/') // same as above
-     * $finder->notPath(['some/file.txt', 'another/file.log'])
-=======
      *     $finder->notPath('some/special/dir')
      *     $finder->notPath('/some\/special\/dir/') // same as above
->>>>>>> 4.1
+     *     $finder->notPath(['some/file.txt', 'another/file.log'])
      *
      * Use only / as dirname separator.
      *
@@ -313,16 +287,10 @@ public function notPath($patterns)
     /**
      * Adds tests for file sizes.
      *
-<<<<<<< HEAD
-     * $finder->size('> 10K');
-     * $finder->size('<= 1Ki');
-     * $finder->size(4);
-     * $finder->size(['> 10K', '< 20K'])
-=======
      *     $finder->size('> 10K');
      *     $finder->size('<= 1Ki');
      *     $finder->size(4);
->>>>>>> 4.1
+     *     $finder->size(['> 10K', '< 20K'])
      *
      * @param string|int|string[]|int[] $sizes A size range string or an integer or an array of size ranges
      *
Original file line number	Diff line number	Diff line change
`@@ -158,16 +158,10 @@ public function date($dates)`
`158`	`158`	`*`
`159`	`159`	`* You can use patterns (delimited with / sign), globs or simple strings.`
`160`	`160`	`*`
`161`		`-<<<<<<< HEAD`
`162`		`- * $finder->name('*.php')`
`163`		`- * $finder->name('/\.php$/') // same as above`
`164`		`- * $finder->name('test.php')`
`165`		`- * $finder->name(['test.py', 'test.php'])`
`166`		`-=======`
`167`	`161`	`* $finder->name('*.php')`
`168`	`162`	`* $finder->name('/\.php$/') // same as above`
`169`	`163`	`* $finder->name('test.php')`
`170`		`->>>>>>> 4.1`
	`164`	`+ * $finder->name(['test.py', 'test.php'])`
`171`	`165`	`*`
`172`	`166`	`* @param string\|string[] $patterns A pattern (a regexp, a glob, or a string) or an array of patterns`
`173`	`167`	`*`
`@@ -203,14 +197,9 @@ public function notName($patterns)`
`203`	`197`	`*`
`204`	`198`	`* Strings or PCRE patterns can be used:`
`205`	`199`	`*`
`206`		`-<<<<<<< HEAD`
`207`		`- * $finder->contains('Lorem ipsum')`
`208`		`- * $finder->contains('/Lorem ipsum/i')`
`209`		`- * $finder->contains(['dolor', '/ipsum/i'])`
`210`		`-=======`
`211`	`200`	`* $finder->contains('Lorem ipsum')`
`212`	`201`	`* $finder->contains('/Lorem ipsum/i')`
`213`		`->>>>>>> 4.1`
	`202`	`+ * $finder->contains(['dolor', '/ipsum/i'])`
`214`	`203`	`*`
`215`	`204`	`* @param string\|string[] $patterns A pattern (string or regexp) or an array of patterns`
`216`	`205`	`*`
`@@ -230,14 +219,9 @@ public function contains($patterns)`
`230`	`219`	`*`
`231`	`220`	`* Strings or PCRE patterns can be used:`
`232`	`221`	`*`
`233`		`-<<<<<<< HEAD`
`234`		`- * $finder->notContains('Lorem ipsum')`
`235`		`- * $finder->notContains('/Lorem ipsum/i')`
`236`		`- * $finder->notContains(['lorem', '/dolor/i'])`
`237`		`-=======`
`238`	`222`	`* $finder->notContains('Lorem ipsum')`
`239`	`223`	`* $finder->notContains('/Lorem ipsum/i')`
`240`		`->>>>>>> 4.1`
	`224`	`+ * $finder->notContains(['lorem', '/dolor/i'])`
`241`	`225`	`*`
`242`	`226`	`* @param string\|string[] $patterns A pattern (string or regexp) or an array of patterns`
`243`	`227`	`*`
`@@ -257,14 +241,9 @@ public function notContains($patterns)`
`257`	`241`	`*`
`258`	`242`	`* You can use patterns (delimited with / sign) or simple strings.`
`259`	`243`	`*`
`260`		`-<<<<<<< HEAD`
`261`		`- * $finder->path('some/special/dir')`
`262`		`- * $finder->path('/some\/special\/dir/') // same as above`
`263`		`- * $finder->path(['some dir', 'another/dir'])`
`264`		`-=======`
`265`	`244`	`* $finder->path('some/special/dir')`
`266`	`245`	`* $finder->path('/some\/special\/dir/') // same as above`
`267`		`->>>>>>> 4.1`
	`246`	`+ * $finder->path(['some dir', 'another/dir'])`
`268`	`247`	`*`
`269`	`248`	`* Use only / as dirname separator.`
`270`	`249`	`*`
`@@ -286,14 +265,9 @@ public function path($patterns)`
`286`	`265`	`*`
`287`	`266`	`* You can use patterns (delimited with / sign) or simple strings.`
`288`	`267`	`*`
`289`		`-<<<<<<< HEAD`
`290`		`- * $finder->notPath('some/special/dir')`
`291`		`- * $finder->notPath('/some\/special\/dir/') // same as above`
`292`		`- * $finder->notPath(['some/file.txt', 'another/file.log'])`
`293`		`-=======`
`294`	`268`	`* $finder->notPath('some/special/dir')`
`295`	`269`	`* $finder->notPath('/some\/special\/dir/') // same as above`
`296`		`->>>>>>> 4.1`
	`270`	`+ * $finder->notPath(['some/file.txt', 'another/file.log'])`
`297`	`271`	`*`
`298`	`272`	`* Use only / as dirname separator.`
`299`	`273`	`*`
`@@ -313,16 +287,10 @@ public function notPath($patterns)`
`313`	`287`	`/**`
`314`	`288`	`* Adds tests for file sizes.`
`315`	`289`	`*`
`316`		`-<<<<<<< HEAD`
`317`		`- * $finder->size('> 10K');`
`318`		`- * $finder->size('<= 1Ki');`
`319`		`- * $finder->size(4);`
`320`		`- * $finder->size(['> 10K', '< 20K'])`
`321`		`-=======`
`322`	`290`	`* $finder->size('> 10K');`
`323`	`291`	`* $finder->size('<= 1Ki');`
`324`	`292`	`* $finder->size(4);`
`325`		`->>>>>>> 4.1`
	`293`	`+ * $finder->size(['> 10K', '< 20K'])`
`326`	`294`	`*`
`327`	`295`	`* @param string\|int\|string[]\|int[] $sizes A size range string or an integer or an array of size ranges`
`328`	`296`	`*`