Commit e434a54
committed
minor symfony#52484 [TwigBundle][WebProfilerBundle] Add conflicts with 7.0 (nicolas-grekas)
This PR was merged into the 6.4 branch.
Discussion
----------
[TwigBundle][WebProfilerBundle] Add conflicts with 7.0
| Q | A
| ------------- | ---
| Branch? | 6.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Issues | -
| License | MIT
Preparing for symfony#52483
Commits
-------
ad1848c [WebProfilerBundle][TwigBundle] Add conflicts with 7.0File tree
2 files changed
+4
-3
lines changed- src/Symfony/Bundle
- TwigBundle
- WebProfilerBundle
2 files changed
+4
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
| 37 | + | |
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
| |||
0 commit comments