summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClint Adams <clint@debian.org>2016-10-27 01:29:00 -0400
committerClint Adams <clint@debian.org>2016-10-27 01:29:00 -0400
commite741edde3ef04dd56075a73ac882dda1a383a33a (patch)
tree9b2251549877143129448791845e4d219d64aaa0
parent506239b7a6abbcc310c5cfb2f4aafe2e92c9e6c9 (diff)
downloadDHG_packages-e741edde3ef04dd56075a73ac882dda1a383a33a.tar.gz
hledger-web: fix b-d
-rw-r--r--p/haskell-hledger-web/debian/control1
1 files changed, 0 insertions, 1 deletions
diff --git a/p/haskell-hledger-web/debian/control b/p/haskell-hledger-web/debian/control
index f3f5aa15c..39d1eca0a 100644
--- a/p/haskell-hledger-web/debian/control
+++ b/p/haskell-hledger-web/debian/control
@@ -84,7 +84,6 @@ Build-Depends-Indep: ghc-doc,
libghc-yesod-core-doc,
libghc-yesod-form-doc,
libghc-yesod-static-doc,
->>>>>>> 0a08443... hledger-web: Upgrading from 0.27 to 1.0
Standards-Version: 3.9.8
Homepage: http://hledger.org
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-hledger-web