[DHG_packages] 01/01: hledger-web: fix b-d

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch experimental
in repository DHG_packages.

commit e741edde3ef04dd56075a73ac882dda1a383a33a
Author: Clint Adams <clint at debian.org>
Date:   Thu Oct 27 01:29:00 2016 -0400

    hledger-web: fix b-d
---
 p/haskell-hledger-web/debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/p/haskell-hledger-web/debian/control b/p/haskell-hledger-web/debian/control
index f3f5aa1..39d1eca 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git