Resolve merge conflict with master

2024-11-24 15:56:36 +03:00 · 2014-06-01 19:05:09 -05:00 · 2014-06-01 19:05:09 -05:00 · acdbaa2ad4
commit acdbaa2ad4
parent e2ded83cbe 8d49892f6e
1 changed files with 2 additions and 2 deletions
--- a/hapistrano.cabal
+++ b/hapistrano.cabal
@ -18,7 +18,7 @@ library
  -- other-modules:
  -- other-extensions:
  exposed-modules:     Hapistrano
-  build-depends:         base >=4.6 && <4.7
+  build-depends:         base >=4.6 && <4.8
                       , time
                       , old-locale
                       , process
@ -26,4 +26,4 @@ library
                       , transformers
                       , lens >= 4.1
  hs-source-dirs:      src
-  default-language:    Haskell2010
+  default-language:    Haskell2010