[Python-modules-commits] [pycurl] 07/19: Release.

[Barry Warsaw]

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

barry pushed a commit to branch ubuntu
in repository pycurl.

commit 7ec0de2590905aa8e830fbd5102097a74d8829f9
Author: Barry Warsaw <barry at python.org>
Date:   Tue Oct 14 17:46:31 2014 -0400

    Release.
---
 debian/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a992aed..5d2d993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,12 +42,16 @@ pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
       -lssh2.
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Release.
  -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
 =======
  -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:38:17 -0400
 >>>>>>> Merge with Debian; remaining changes:
+=======
+ -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
+>>>>>>> Release.
 
 pycurl (7.19.5-3) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycurl.git