This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository dawg.git.
commit d59b62b9f16f194b35a7ed606ac8143a71751060 Author: Andreas Tille <[email protected]> Date: Wed Jan 4 09:03:55 2017 +0100 Fix merge --- debian/control | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/control b/debian/control index 87db91c..7425ed1 100644 --- a/debian/control +++ b/debian/control @@ -8,11 +8,7 @@ Build-Depends: debhelper (>= 10), bison, flex Standards-Version: 3.9.8 -<<<<<<< HEAD -Vcs-Browser: http://anonscm.debian.org/cgit/debian-med/dawg.git -======= Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/dawg.git ->>>>>>> cme fix dpkg-control Vcs-Git: https://anonscm.debian.org/git/debian-med/dawg.git Homepage: https://github.com/reedacartwright/dawg -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dawg.git.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
