From d99da56f8eb733ddd41b54fb41e6d25a81c34cd1 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 1 May 2019 19:50:42 +0200 Subject: [PATCH] fix conflict resolution --- .../Tests/Extension/AbstractBootstrap3LayoutTest.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php index 8affc01987..b332ff018d 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php @@ -2551,13 +2551,8 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest [@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 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest '/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 ' ); }