From 7f13f74fc6eb0d665fb1ec538476ef63f92eb6f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9cate?= <Kleidukos@users.noreply.github.com>
Date: Thu, 9 Jan 2025 17:13:29 +0000
Subject: [PATCH] resolve conflicts

---
 .hlint.yaml                              | 29 ------------------------
 cabal-install/tests/IntegrationTests2.hs |  7 ------
 2 files changed, 36 deletions(-)

diff --git a/.hlint.yaml b/.hlint.yaml
index d4a2f20b32b..506bbbdb2c4 100644
--- a/.hlint.yaml
+++ b/.hlint.yaml
@@ -1,14 +1,8 @@
 # Warnings currently triggered by your code
 - ignore: {name: "Avoid NonEmpty.unzip"} # 1 hint
-<<<<<<< HEAD
 - ignore: {name: "Avoid lambda"} # 46 hints
 - ignore: {name: "Avoid lambda using `infix`"} # 22 hints
 - ignore: {name: "Eta reduce"} # 116 hints
-=======
-- ignore: {name: "Avoid lambda"} # 47 hints
-- ignore: {name: "Avoid lambda using `infix`"} # 23 hints
-- ignore: {name: "Eta reduce"} # 124 hints
->>>>>>> d165dfda4 (Bump hlint warning counts)
 - ignore: {name: "Evaluate"} # 10 hints
 - ignore: {name: "Functor law"} # 10 hints
 - ignore: {name: "Fuse concatMap/map"} # 3 hints
@@ -22,19 +16,11 @@
 - ignore: {name: "Monoid law, right identity"} # 3 hints
 - ignore: {name: "Move filter"} # 4 hints
 - ignore: {name: "Move guards forward"} # 4 hints
-<<<<<<< HEAD
 - ignore: {name: "Redundant $"} # 175 hints
 - ignore: {name: "Redundant $!"} # 1 hint
 - ignore: {name: "Redundant <$>"} # 16 hints
 - ignore: {name: "Redundant =="} # 1 hint
 - ignore: {name: "Redundant bracket"} # 232 hints
-=======
-- ignore: {name: "Redundant $"} # 178 hints
-- ignore: {name: "Redundant $!"} # 1 hint
-- ignore: {name: "Redundant <$>"} # 16 hints
-- ignore: {name: "Redundant =="} # 1 hint
-- ignore: {name: "Redundant bracket"} # 240 hints
->>>>>>> d165dfda4 (Bump hlint warning counts)
 - ignore: {name: "Redundant fmap"} # 1 hint
 - ignore: {name: "Redundant guard"} # 2 hints
 - ignore: {name: "Redundant if"} # 3 hints
@@ -63,16 +49,8 @@
 - ignore: {name: "Use concatMap"} # 1 hint
 - ignore: {name: "Use const"} # 36 hints
 - ignore: {name: "Use elem"} # 2 hints
-<<<<<<< HEAD
-- ignore: {name: "Use fewer imports"} # 19 hints
-=======
->>>>>>> 217f08ac5 (Follow hlint suggestion: use fewer imports)
 - ignore: {name: "Use first"} # 4 hints
-<<<<<<< HEAD
-- ignore: {name: "Use fmap"} # 24 hints
-=======
 - ignore: {name: "Use fmap"} # 25 hints
->>>>>>> d165dfda4 (Bump hlint warning counts)
 - ignore: {name: "Use fold"} # 1 hint
 - ignore: {name: "Use for"} # 1 hint
 - ignore: {name: "Use forM_"} # 1 hint
@@ -88,11 +66,7 @@
 - ignore: {name: "Use isNothing"} # 1 hint
 - ignore: {name: "Use lambda-case"} # 47 hints
 - ignore: {name: "Use lefts"} # 1 hint
-<<<<<<< HEAD
-- ignore: {name: "Use list comprehension"} # 16 hints
-=======
 - ignore: {name: "Use list comprehension"} # 19 hints
->>>>>>> d165dfda4 (Bump hlint warning counts)
 - ignore: {name: "Use list literal"} # 3 hints
 - ignore: {name: "Use list literal pattern"} # 11 hints
 - ignore: {name: "Use map once"} # 7 hints
@@ -121,12 +95,9 @@
 
 - arguments:
     - --ignore-glob=Cabal-syntax/src/Distribution/Fields/Lexer.hs
-<<<<<<< HEAD
-=======
     - --ignore-glob=Cabal-tests/tests/custom-setup/CabalDoctestSetup.hs
     - --ignore-glob=Cabal-tests/tests/custom-setup/IdrisSetup.hs
     - --ignore-glob=cabal-testsuite/PackageTests/BuildWays/q/app/Main.hs
->>>>>>> 217f08ac5 (Follow hlint suggestion: use fewer imports)
     - --ignore-glob=cabal-testsuite/PackageTests/CmmSources/src/Demo.hs
     - --ignore-glob=cabal-testsuite/PackageTests/CmmSourcesDyn/src/Demo.hs
     - --ignore-glob=cabal-testsuite/PackageTests/CmmSourcesExe/src/Demo.hs
diff --git a/cabal-install/tests/IntegrationTests2.hs b/cabal-install/tests/IntegrationTests2.hs
index 514b0f05a85..00d95474f9a 100644
--- a/cabal-install/tests/IntegrationTests2.hs
+++ b/cabal-install/tests/IntegrationTests2.hs
@@ -45,8 +45,6 @@ import qualified Distribution.Client.CmdBench          as CmdBench
 import qualified Distribution.Client.CmdHaddock        as CmdHaddock
 import qualified Distribution.Client.CmdListBin        as CmdListBin
 
-<<<<<<< HEAD
-=======
 import qualified Distribution.Client.CmdHaddockProject as CmdHaddockProject
 import Distribution.Client.Config (SavedConfig (savedGlobalFlags), createDefaultConfigFile, loadConfig)
 import Distribution.Client.GlobalFlags
@@ -57,7 +55,6 @@ import Distribution.Client.GlobalFlags
 import Distribution.Client.Setup (globalCommand, globalStoreDir)
 import Distribution.InstalledPackageInfo (InstalledPackageInfo)
 import Distribution.ModuleName (ModuleName)
->>>>>>> 217f08ac5 (Follow hlint suggestion: use fewer imports)
 import Distribution.Package
 import Distribution.PackageDescription
 import Distribution.InstalledPackageInfo (InstalledPackageInfo)
@@ -96,11 +93,7 @@ import Test.Tasty.Options
 import Data.Tagged (Tagged(..))
 
 import qualified Data.ByteString as BS
-<<<<<<< HEAD
-import Distribution.Client.GlobalFlags (GlobalFlags, globalNix)
-=======
 import Data.Maybe (fromJust)
->>>>>>> 217f08ac5 (Follow hlint suggestion: use fewer imports)
 import Distribution.Simple.Flag (Flag (Flag, NoFlag))
 import Distribution.Types.ParStrat
 import Data.Maybe (fromJust)