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

treinen pushed a commit to branch jessie-backports/master
in repository dose3.

commit 0509a4bf7ce81343c625304178b54cefdd74798f
Author: Ralf Treinen <trei...@irif.fr>
Date:   Mon Jan 23 12:47:56 2017 +0100

    debian/changelog: fix an artifact from merge
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6da0a96..0a75938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,7 +51,6 @@ dose3 (5.0.1-3) unstable; urgency=medium
     transition to ocaml 4.03 which does no longer include ocamlbuild.
 
  -- Ralf Treinen <trei...@debian.org>  Tue, 25 Oct 2016 22:03:12 +0200
->>>>>>> master
 
 dose3 (5.0.1-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to