fixup! Show import tree provenance

haskell · Apr 9, 2024 · cd36ea4 · cd36ea4
1 parent 24d749b
commit cd36ea4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs
@@ -171,8 +171,6 @@ import Distribution.System (Arch, OS)
 import Distribution.Types.PackageVersionConstraint
   ( PackageVersionConstraint
   )
-<<<<<<< HEAD
-=======
 import Distribution.Utils.Path hiding
   ( (<.>)
   , (</>)
@@ -184,7 +182,6 @@ import qualified Data.Set as Set
 import Network.URI (URI (..), parseURI)
 import System.Directory (createDirectoryIfMissing, makeAbsolute)
 import System.FilePath (isAbsolute, isPathSeparator, makeValid, splitFileName, (</>))
->>>>>>> f8cd56341 (Show provenance of import constraint)
 import Text.PrettyPrint
   ( Doc
   , render