[Pkg-voip-commits] [asterisk] 02/06: Remove a line that was wrongely changed

[tzafrir at debian.org]

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

tzafrir pushed a commit to branch master
in repository asterisk.

commit 4c582563559e6f603cf724d614f47a499fda5d0b
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sun Oct 26 20:59:35 2014 +0200

    Remove a line that was wrongely changed
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 426b1f0..d690832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1420,7 +1420,6 @@
 	  read/write format comments. * Fixed a doxygen tag typo.
 
 	* main/astobj2.c, contrib/scripts/refcounter.py, /:
->>>>>>> upstream/13.0.0_dfsg
 	  astobj2.c/refcounter.py: Fix to deal with invalid object refs. *
 	  Make astob2 REF_DEBUG output an invalid object line when an
 	  invalid ao2 object ref/unref is attempted. This is similar to the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git