Commit 5cc07e7
committed
minor symfony#58854 [Routing] fix merge (xabbuh)
This PR was merged into the 6.4 branch.
Discussion
----------
[Routing] fix merge
| Q | A
| ------------- | ---
| Branch? | 6.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Issues |
| License | MIT
Commits
-------
e4f2ae6 fix mergeFile tree
2 files changed
+2
-2
lines changed- src/Symfony/Component/Routing/Tests
- Fixtures/locale_and_host
- Loader
2 files changed
+2
-2
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
486 | 486 | | |
487 | 487 | | |
488 | 488 | | |
489 | | - | |
| 489 | + | |
490 | 490 | | |
491 | 491 | | |
492 | 492 | | |
| |||
0 commit comments