Correct ghc-8.8.3 stack.yaml's

Author: jneira

stack-8.8.3.yaml

@@ -9,20 +9,16 @@ extra-deps:
 - apply-refact-0.7.0.0
 - bytestring-trie-0.2.5.0@rev1
 # - cabal-helper-1.0.0.0
-- github: jneira/cabal-helper
-  commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
+- github: DanielG/cabal-helper
+  commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
 - clock-0.7.2
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.2
-# To avoid build error with ghc-8.8.2
-# See https://github.com/haskell/haddock/issues/1123
-- git: https://github.com/haskell/haddock.git
-  commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
-  subdirs:
-    - haddock-api
-# - haddock-api-2.23.0
+- haddock-api-2.23.1
 - hoogle-5.0.17.15
 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170
+- ghc-lib-parser-8.8.2.20200205
+- ghc-lib-parser-ex-8.8.5.3
 - ilist-0.3.1.0
 - monad-dijkstra-0.1.1.2
 - semigroups-0.18.5

stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2020-03-18
+resolver: nightly-2020-04-09
 
 packages:
 - .
@@ -15,25 +15,14 @@ extra-deps:
 - clock-0.7.2
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.2
-<<<<<<< HEAD
 - ghc-lib-parser-8.8.2.20200205
 - ghc-lib-parser-ex-8.8.5.3
 - haddock-api-2.23.1
 - haddock-library-1.8.0
 - haskell-lsp-0.20.0.0
 - haskell-lsp-types-0.20.0.0
+- haskell-src-exts-1.22.0
 - lsp-test-0.10.1.0
-- hie-bios-0.4.0
-- hlint-2.2.11
-=======
-# To avoid build error with ghc-8.8.2
-# See https://github.com/haskell/haddock/issues/1123
-- git: https://github.com/haskell/haddock.git
-  commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
-  subdirs:
-    - haddock-api
-# - haddock-api-2.23.0
->>>>>>> a8e55590... Update ghc-8.8.3 stackage resolvers
 - hoogle-5.0.17.15
 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170
 - ilist-0.3.1.0