diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
-------

d99da56f8e fix conflict resolution
This commit is contained in:
Christian Flothmann 2019-05-01 20:09:17 +02:00
parent 58d03ea0cc d99da56f8e
commit c5f450b54c
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
View File

@ -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
'
);
}