[Pkg-privacy-commits] [vidalia] 88/160: Remove leftovers of partly resolved conflict.

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:36 UTC 2015


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

infinity0 pushed a commit to branch master
in repository vidalia.

commit 0a83ae8272e2676d9e5b0eb7c9f722b9560fd91f
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Nov 28 15:37:50 2011 +0100

    Remove leftovers of partly resolved conflict.
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3fd3d5b..cd7696c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,7 +35,6 @@ vidalia (0.2.14-2) unstable; urgency=low
     changes to handle socket com out of the box (Closes: #640077).
 
  -- Ulises Vitulli <dererk at debian.org>  Sat, 03 Sep 2011 15:47:23 -0300
->>>>>>> collab-maint/master
 
 vidalia (0.2.14-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git



More information about the Pkg-privacy-commits mailing list