Commit 5abbe7e
committed
MC-5806: Detection of URL dependencies does not work for the Dependency static test
-- fix merge conflict1 parent b2e35f2 commit 5abbe7e
File tree
1 file changed
+2
-6
lines changed- dev/tests/static/testsuite/Magento/Test/Legacy
1 file changed
+2
-6
lines changedLines changed: 2 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | 8 | | |
11 | 9 | | |
12 | 10 | | |
13 | 11 | | |
14 | 12 | | |
15 | | - | |
| 13 | + | |
16 | 14 | | |
17 | 15 | | |
18 | 16 | | |
| |||
370 | 368 | | |
371 | 369 | | |
372 | 370 | | |
373 | | - | |
374 | | - | |
375 | 371 | | |
376 | 372 | | |
377 | 373 | | |
0 commit comments