Commit d7d9be3
committed
minor symfony#58869 [TypeInfo] tighten conflict rules (xabbuh)
This PR was merged into the 7.2 branch.
Discussion
----------
[TypeInfo] tighten conflict rules
| Q | A
| ------------- | ---
| Branch? | 7.2
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Issues | Fix symfony#57630 (comment)
| License | MIT
Commits
-------
87579c0 tighten conflict rules1 file changed
+5
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | | - | |
41 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
42 | 44 | | |
43 | 45 | | |
44 | 46 | | |
| |||
0 commit comments