Skip to content

Commit ea5776d

Browse files
committed
Remove a merge conflict that mergifyio backed into the codbase
1 parent 263f120 commit ea5776d

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

cabal-install/cabal-install.cabal

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ Flag lukko
5252
default: True
5353
manual: True
5454

55-
<<<<<<< HEAD
5655
executable cabal
5756
main-is: Main.hs
5857
hs-source-dirs: main
@@ -63,17 +62,6 @@ executable cabal
6362
-Wnoncanonical-monad-instances
6463
if impl(ghc < 8.8)
6564
ghc-options: -Wnoncanonical-monadfail-instances
66-
=======
67-
common warnings
68-
ghc-options: -Wall -Wcompat -Wnoncanonical-monad-instances -Wincomplete-uni-patterns -Wincomplete-record-updates
69-
if impl(ghc < 8.8)
70-
ghc-options: -Wnoncanonical-monadfail-instances
71-
if impl(ghc >=8.10)
72-
ghc-options: -Wunused-packages
73-
74-
common base-dep
75-
build-depends: base >=4.10 && <4.16
76-
>>>>>>> 2917995d0 (Turn on a few extra GHC warnings)
7765

7866
if impl(ghc >=8.10)
7967
ghc-options: -Wunused-packages

0 commit comments

Comments
 (0)