fix merge conflicts

haskell · May 27, 2023 · 8e37853 · 8e37853
1 parent 6a6ba55
commit 8e37853
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 37 deletions.
diff --git a/cabal-install/src/Distribution/Client/CmdRun.hs b/cabal-install/src/Distribution/Client/CmdRun.hs
@@ -30,24 +30,11 @@ import Distribution.Client.CmdErrorMessages
            renderListPretty )
 import Distribution.Client.GlobalFlags
          ( defaultGlobalFlags )
-<<<<<<< HEAD
-import Distribution.Simple.Flag
-         ( fromFlagOrDefault )
-import Distribution.Simple.Command
-         ( CommandUI(..), usageAlternatives )
-import Distribution.Types.ComponentName
-         ( componentNameRaw )
-import Distribution.Verbosity
-         ( normal, silent )
-import Distribution.Simple.Utils
-         ( wrapText, die', info, notice, safeHead )
-=======
 import Distribution.Client.InstallPlan
          ( toList, foldPlanPackage )
 import Distribution.Client.NixStyleOptions
          ( NixStyleFlags (..), nixStyleOptions, defaultNixStyleFlags )
 import Distribution.Client.ProjectOrchestration
->>>>>>> a482a63c1 (Shorten script-builds paths (#8898))
 import Distribution.Client.ProjectPlanning
          ( ElaboratedConfiguredPackage(..)
          , ElaboratedInstallPlan, binDirectoryFor )
@@ -61,8 +48,6 @@ import Distribution.Client.Setup
          ( GlobalFlags(..), ConfigFlags(..) )
 import Distribution.Client.TargetProblem
          ( TargetProblem (..) )
-import Distribution.Client.Utils
-         ( occursOnlyOrBefore, giveRTSWarning )
 import Distribution.Simple.Command
          ( CommandUI(..), usageAlternatives )
 import Distribution.Simple.Flag
@@ -76,23 +61,14 @@ import Distribution.Types.ComponentName
          ( componentNameRaw )
 import Distribution.Types.UnitId
          ( UnitId )
-<<<<<<< HEAD
-import Distribution.Client.ScriptUtils
-         ( AcceptNoTargets(..), withContextAndSelectors, updateContextAndWriteProjectFile, TargetContext(..) )
-=======
+
 import Distribution.Types.UnqualComponentName
          ( UnqualComponentName, unUnqualComponentName )
 import Distribution.Verbosity
          ( normal, silent )
->>>>>>> a482a63c1 (Shorten script-builds paths (#8898))
 
 import Data.List (group)
 import qualified Data.Set as Set
-<<<<<<< HEAD
-=======
-import GHC.Environment
-         ( getFullArgs )
->>>>>>> a482a63c1 (Shorten script-builds paths (#8898))
 import System.Directory
          ( doesFileExist )
 import System.FilePath

diff --git a/cabal-install/src/Distribution/Client/ProjectConfig.hs b/cabal-install/src/Distribution/Client/ProjectConfig.hs
@@ -463,17 +463,6 @@ renderBadProjectRoot :: BadProjectRoot -> String
 renderBadProjectRoot (BadProjectRootExplicitFile projectFile) =
     "The given project file '" ++ projectFile ++ "' does not exist."
 
-<<<<<<< HEAD
-=======
-  BadProjectRootDir dir ->
-    "The given project directory '" <> dir <> "' does not exist."
-
-  BadProjectRootAbsoluteFile file ->
-    "The given project file '" <> file <> "' does not exist."
-
-  BadProjectRootDirFile dir file ->
-    "The given project directory/file combination '" <> dir </> file <> "' does not exist."
-
 withGlobalConfig
     :: Verbosity                  -- ^ verbosity
     -> Flag FilePath              -- ^ @--cabal-config@
@@ -483,7 +472,6 @@ withGlobalConfig verbosity gcf with = do
     globalConfig <- runRebuild "" $ readGlobalConfig verbosity gcf
     with globalConfig
 
->>>>>>> a482a63c1 (Shorten script-builds paths (#8898))
 withProjectOrGlobalConfig
     :: Verbosity                  -- ^ verbosity
     -> Flag Bool                  -- ^ whether to ignore local project (--ignore-project flag)