This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository dawg.git.
commit 2cb8e3aefbf3ecf3687b9a822ec38a704ba8a0fe Author: Andreas Tille <[email protected]> Date: Wed Jan 4 08:50:03 2017 +0100 cme fix dpkg-control --- debian/changelog | 1 + debian/control | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index db5089c..a25c3eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dawg (1.2-2) UNRELEASED; urgency=medium * Team upload * Add citation * Homepage vanished but project is on Github - use this as homepage + * cme fix dpkg-control -- Andreas Tille <[email protected]> Wed, 04 Jan 2017 08:44:59 +0100 diff --git a/debian/control b/debian/control index 2cb8a08..df31844 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,11 @@ Build-Depends: debhelper (>= 9), 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
