[Python-modules-commits] [pycurl] 03/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 519ae505967e7f9c49c8fe1cb7eb8dc240b9596b
Author: Barry Warsaw <barry at python.org>
Date:   Tue Oct 14 17:46:31 2014 -0400

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

diff --git a/debian/changelog b/debian/changelog
index 411f238..845af70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 pycurl (7.19.5.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -11,6 +12,9 @@ pycurl (7.19.5.1-1ubuntu2) wily; urgency=medium
  -- Steve Langasek <steve.langasek at ubuntu.com>  Wed, 22 Jul 2015 21:12:58 +0000
 
 pycurl (7.19.5.1-1ubuntu1) wily; urgency=medium
+=======
+pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
+>>>>>>> Release.
 
   * Merge with Debian; remaining changes:
     - Remove build dependency on python-bottle (universe).
@@ -18,6 +22,7 @@ pycurl (7.19.5.1-1ubuntu1) wily; urgency=medium
       not needed since in Ubuntu, curl-config --static-libs doesn't return
       -lssh2.
 
+<<<<<<< HEAD
  -- Barry Warsaw <barry at ubuntu.com>  Mon, 11 May 2015 15:50:26 -0400
 
 pycurl (7.19.5.1-1) unstable; urgency=medium
@@ -36,6 +41,8 @@ pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
       not needed since in Ubuntu, curl-config --static-libs doesn't return
       -lssh2.
 
+=======
+>>>>>>> Release.
  -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
 
 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