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:
commit
c5f450b54c
@ -2551,13 +2551,8 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
|
|||||||
[@name="name"]
|
[@name="name"]
|
||||||
[@class="my&class form-control"]
|
[@class="my&class form-control"]
|
||||||
[not(@required)]
|
[not(@required)]
|
||||||
<<<<<<< HEAD
|
|
||||||
[./option[@value="Europe/Vienna"][@selected="selected"][.="Europe / Vienna"]]
|
[./option[@value="Europe/Vienna"][@selected="selected"][.="Europe / Vienna"]]
|
||||||
[count(./option)>200]
|
|
||||||
=======
|
|
||||||
[.//option[@value="Europe/Vienna"][@selected="selected"]]
|
|
||||||
[count(.//option)>200]
|
[count(.//option)>200]
|
||||||
>>>>>>> 4.2
|
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -2573,11 +2568,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
|
|||||||
'/select
|
'/select
|
||||||
[@class="my&class form-control"]
|
[@class="my&class form-control"]
|
||||||
[./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
|
[./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
|
||||||
<<<<<<< HEAD
|
|
||||||
[count(./option)>201]
|
|
||||||
=======
|
|
||||||
[count(.//option)>201]
|
[count(.//option)>201]
|
||||||
>>>>>>> 4.2
|
|
||||||
'
|
'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user