Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c5f450b

Browse filesBrowse files
committed
minor #31352 [TwigBridge] fix conflict resolution (xabbuh)
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
2 parents 58d03ea + d99da56 commit c5f450b
Copy full SHA for c5f450b

File tree

Expand file treeCollapse file tree

1 file changed

+0
-9
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+0
-9
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
-9Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2551,13 +2551,8 @@ public function testTimezone()
25512551
[@name="name"]
25522552
[@class="my&class form-control"]
25532553
[not(@required)]
2554-
<<<<<<< HEAD
25552554
[./option[@value="Europe/Vienna"][@selected="selected"][.="Europe / Vienna"]]
2556-
[count(./option)>200]
2557-
=======
2558-
[.//option[@value="Europe/Vienna"][@selected="selected"]]
25592555
[count(.//option)>200]
2560-
>>>>>>> 4.2
25612556
'
25622557
);
25632558
}
@@ -2573,11 +2568,7 @@ public function testTimezoneWithPlaceholder()
25732568
'/select
25742569
[@class="my&class form-control"]
25752570
[./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
2576-
<<<<<<< HEAD
2577-
[count(./option)>201]
2578-
=======
25792571
[count(.//option)>201]
2580-
>>>>>>> 4.2
25812572
'
25822573
);
25832574
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.