minor #31352 [TwigBridge] fix conflict resolution (xabbuh)

xabbuh · xabbuh · commit c5f450b54cfc · 2019-05-01T20:09:17.000+02:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [TwigBridge] fix conflict resolution | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- d99da56 fix conflict resolution
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -2551,13 +2551,8 @@ public function testTimezone()
     [@name="name"]
     [@class="my&class form-control"]
     [not(@required)]
-<<<<<<< HEAD
     [./option[@value="Europe/Vienna"][@selected="selected"][.="Europe / Vienna"]]
-    [count(./option)>200]
-=======
-    [.//option[@value="Europe/Vienna"][@selected="selected"]]
     [count(.//option)>200]
->>>>>>> 4.2
 '
         );
     }
@@ -2573,11 +2568,7 @@ public function testTimezoneWithPlaceholder()
 '/select
     [@class="my&class form-control"]
     [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
-<<<<<<< HEAD
-    [count(./option)>201]
-=======
     [count(.//option)>201]
->>>>>>> 4.2
 '
         );
     }
