Fix merge

More fixing the merge

No, seriously fix the merge

Fix a broken merge

Author: isovector

ghcide/src/Development/IDE/GHC/Compat/Core.hs

@@ -67,10 +67,8 @@ module Development.IDE.GHC.Compat.Core (
     -- slightly unsafe
     setUnsafeGlobalDynFlags,
     -- * Linear Haskell
-#if !MIN_VERSION_ghc(9,0,0)
     Scaled,
     unrestricted,
-#endif
     scaledThing,
     -- * Interface Files
     IfaceExport,
@@ -136,7 +134,6 @@ module Development.IDE.GHC.Compat.Core (
 #endif
     Development.IDE.GHC.Compat.Core.mkVisFunTys,
     Development.IDE.GHC.Compat.Core.mkInfForAllTys,
-#endif
     -- * Specs
     ImpDeclSpec(..),
     ImportSpec(..),
@@ -385,7 +382,6 @@ module Development.IDE.GHC.Compat.Core (
     module GHC.Types.Var,
     module GHC.Unit.Module,
     module GHC.Utils.Error,
-    module TcType,
 #else
     module BasicTypes,
     module Class,
@@ -885,6 +881,7 @@ scaledThing = id
 
 unrestricted :: a -> Scaled a
 unrestricted = id
+#endif
 
 mkVisFunTys :: [Scaled Type] -> Type -> Type
 mkVisFunTys =
@@ -896,6 +893,9 @@ mkVisFunTys =
 
 mkInfForAllTys :: [TyVar] -> Type -> Type
 mkInfForAllTys =
+#if MIN_VERSION_ghc(9,0,0)
+  TcType.mkInfForAllTys
+#else
   mkInfForAllTys
 #endif
 
@@ -957,14 +957,12 @@ type PlainGhcException = Plain.PlainGhcException
 type PlainGhcException = Plain.GhcException
 #endif
 
-<<<<<<< HEAD
 #if MIN_VERSION_ghc(9,0,0)
 -- This is from the old api, but it still simplifies
 pattern ConPatIn :: SrcLoc.Located (ConLikeP GhcPs) -> HsConPatDetails GhcPs -> Pat GhcPs
 pattern ConPatIn con args = ConPat NoExtField con args
 #endif
 
-=======
 initDynLinker, initObjLinker :: HscEnv -> IO ()
 initDynLinker =
 #if !MIN_VERSION_ghc(9,0,0)
@@ -1061,4 +1059,3 @@ collectHsBindsBinders x = GHC.collectHsBindsBinders CollNoDictBinders x
 pattern HsLet xlet localBinds expr <- GHC.HsLet xlet (SrcLoc.unLoc -> localBinds) expr
 pattern LetStmt xlet localBinds <- GHC.LetStmt xlet (SrcLoc.unLoc -> localBinds)
 #endif
->>>>>>> master

plugins/hls-tactics-plugin/src/Wingman/GHC.hs

@@ -196,11 +196,7 @@ pattern SingleLet bind pats val expr <-
   HsLet _
     (HsValBinds _
       (ValBinds _ (bagToList ->
-<<<<<<< HEAD
-        [L _ (FunBind {fun_id = (L _ bind), fun_matches = (MG _ (L _ [L _ (AMatch _ pats val)]) _)})]) _)))
-=======
-        [(L _ (FunBind _ (L _ bind) (MG _ (L _ [L _ (AMatch _ pats val)]) _) _ _))]) _))
->>>>>>> master
+        [L _ (FunBind {fun_id = (L _ bind), fun_matches = (MG _ (L _ [L _ (AMatch _ pats val)]) _)})]) _))
     (L _ expr)