From 2669ba4474cd6185735e084d9a79b5ba49e75492 Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Tue, 4 May 2021 23:47:02 +0800
Subject: [PATCH 1/2] Add bounds for base in hls-test-utils (#1791)

(cherry picked from commit 98fa0fc1a2c451a1a4b898a91cc78e2de23a9e58)

# Conflicts:
#	hls-test-utils/hls-test-utils.cabal
---
 hls-test-utils/hls-test-utils.cabal | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hls-test-utils/hls-test-utils.cabal b/hls-test-utils/hls-test-utils.cabal
index 79533a6b2d..cb187e77ad 100644
--- a/hls-test-utils/hls-test-utils.cabal
+++ b/hls-test-utils/hls-test-utils.cabal
@@ -5,9 +5,7 @@ synopsis:      Utilities used in the tests of Haskell Language Server
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
 
-homepage:
-  https://github.com/haskell/haskell-language-server#readme
-
+homepage:      https://github.com/haskell/haskell-language-server#readme
 bug-reports:   https://github.com/haskell/haskell-language-server/issues
 license:       Apache-2.0
 license-file:  LICENSE
@@ -35,7 +33,7 @@ library
   build-depends:
     , aeson
     , async
-    , base
+    , base                    >=4.12     && <5
     , blaze-markup
     , bytestring
     , containers
@@ -44,6 +42,7 @@ library
     , extra
     , filepath
     , ghcide                  ^>=1.2
+    , hls-graph
     , hls-plugin-api          ^>=1.1
     , hspec
     , hspec-core
@@ -51,7 +50,10 @@ library
     , lsp                     ^>=1.2
     , lsp-test                ==0.14.0.0
     , lsp-types               ^>=1.2
+<<<<<<< HEAD
     , shake
+=======
+>>>>>>> 98fa0fc1... Add bounds for base in hls-test-utils (#1791)
     , tasty
     , tasty-expected-failure
     , tasty-golden

From a5c048418c64be56555453d08566dc587793133a Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Tue, 4 May 2021 23:58:32 +0800
Subject: [PATCH 2/2] Fix conflict

---
 hls-test-utils/hls-test-utils.cabal | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hls-test-utils/hls-test-utils.cabal b/hls-test-utils/hls-test-utils.cabal
index cb187e77ad..3715d1a2b4 100644
--- a/hls-test-utils/hls-test-utils.cabal
+++ b/hls-test-utils/hls-test-utils.cabal
@@ -42,7 +42,6 @@ library
     , extra
     , filepath
     , ghcide                  ^>=1.2
-    , hls-graph
     , hls-plugin-api          ^>=1.1
     , hspec
     , hspec-core
@@ -50,10 +49,7 @@ library
     , lsp                     ^>=1.2
     , lsp-test                ==0.14.0.0
     , lsp-types               ^>=1.2
-<<<<<<< HEAD
     , shake
-=======
->>>>>>> 98fa0fc1... Add bounds for base in hls-test-utils (#1791)
     , tasty
     , tasty-expected-failure
     , tasty-golden