diff options
Diffstat (limited to 'testsuite/tests/cabal/cabal05/r/r.cabal')
| -rw-r--r-- | testsuite/tests/cabal/cabal05/r/r.cabal | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/testsuite/tests/cabal/cabal05/r/r.cabal b/testsuite/tests/cabal/cabal05/r/r.cabal index d550340c0e..b2d4ab0939 100644 --- a/testsuite/tests/cabal/cabal05/r/r.cabal +++ b/testsuite/tests/cabal/cabal05/r/r.cabal @@ -14,7 +14,7 @@ library -- qualified=NO, where=DEP(BOTH), renaming=YES, conflict=NO P as RP2, -- qualified=NO, where=DEP(BOTH), renaming=YES, conflict=YES - P2 as PMerge, + P as PMerge, -- qualified=YES, where=DEP(ORIG), renaming=YES, conflict=NO p:P as RP, -- qualified=YES, where=DEP(REEX), renaming=YES, conflict=NO @@ -28,5 +28,6 @@ library -- qualified=YES, where=DEP, renaming=NO, conflict=YES (q) q:Q, -- qualified=YES, where=DEP(ORIG), renaming=YES, conflict=YES (q) - p:P2 as PMerge2 + p:P2 as PMerge2, + P as Conflict build-depends: base, p, q |