[Pkg-cli-apps-commits] [smuxi] 04/04: Removed overseen conflict marker from changelog

[Mirco Bauer]

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

meebey pushed a commit to branch raring-backports
in repository smuxi.

commit 34c0a61b8da9f3aca0994874ca766d8c7aec0741
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Sep 8 17:15:03 2013 +0200

    Removed overseen conflict marker from changelog
---
 debian/changelog |    1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c6195d9..e4b5fe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,7 +40,6 @@ smuxi (0.9-1) unstable; urgency=low
               regular build sys
 
  -- Mirco Bauer <meebey at debian.org>  Sun, 25 Aug 2013 22:20:32 +0200
->>>>>>> master
 
 smuxi (0.8.11-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/smuxi.git