[DHG_packages] 01/01: Fix merge

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch experimental
in repository DHG_packages.

commit 982939b65515d710bec81595a68b5602c17537e1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jun 2 18:58:05 2016 +0200

    Fix merge
---
 p/haskell-binary-orphans/debian/control | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/p/haskell-binary-orphans/debian/control b/p/haskell-binary-orphans/debian/control
index c3afc0d..3267a45 100644
--- a/p/haskell-binary-orphans/debian/control
+++ b/p/haskell-binary-orphans/debian/control
@@ -57,13 +57,8 @@ Build-Depends-Indep: ghc-doc,
  libghc-vector-binary-instances-doc,
 Standards-Version: 3.9.8
 Homepage: https://github.com/phadej/binary-orphans#readme
-<<<<<<< HEAD
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
-Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
-=======
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-binary-orphans
-Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git
->>>>>>> master
+Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 X-Description: Orphan instances for binary
  `binary-orphans` defines orphan instances for types in some popular packages,
  in particular:

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