Remove a merge conflict that mergifyio backed into the codbase

Author: Mikolaj

cabal-install/cabal-install.cabal

@@ -52,7 +52,6 @@ Flag lukko
   default:      True
   manual:       True
 
-<<<<<<< HEAD
 executable cabal
     main-is:        Main.hs
     hs-source-dirs: main
@@ -63,17 +62,6 @@ executable cabal
                      -Wnoncanonical-monad-instances
       if impl(ghc < 8.8)
         ghc-options: -Wnoncanonical-monadfail-instances
-=======
-common warnings
-    ghc-options: -Wall -Wcompat -Wnoncanonical-monad-instances -Wincomplete-uni-patterns -Wincomplete-record-updates
-    if impl(ghc < 8.8)
-      ghc-options: -Wnoncanonical-monadfail-instances
-    if impl(ghc >=8.10)
-      ghc-options: -Wunused-packages
-
-common base-dep
-    build-depends: base >=4.10 && <4.16
->>>>>>> 2917995d0 (Turn on a few extra GHC warnings)
 
       if impl(ghc >=8.10)
         ghc-options: -Wunused-packages