Enforce CONSERVATIVE_UPGRADE=no in some tests
modified tests/frontend/conflicts-multirepo.shin
@@ -170,7 +170,7 @@ ${JAILED}[2/2] Extracting test-1.1... done
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|