[Python-modules-commits] [pycurl] 08/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 dc8087a34949c3f671292656baa0da920979a3de
Author: Barry Warsaw <barry at python.org>
Date:   Mon May 11 16:53:06 2015 -0400

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

diff --git a/debian/changelog b/debian/changelog
index 5d2d993..7914eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 pycurl (7.19.5.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -15,6 +16,9 @@ pycurl (7.19.5.1-1ubuntu1) wily; urgency=medium
 =======
 pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
 >>>>>>> Release.
+=======
+pycurl (7.19.5.1-1ubuntu1) wily; urgency=medium
+>>>>>>> release
 
   * Merge with Debian; remaining changes:
     - Remove build dependency on python-bottle (universe).
@@ -23,6 +27,9 @@ pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
       -lssh2.
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> release
  -- Barry Warsaw <barry at ubuntu.com>  Mon, 11 May 2015 15:50:26 -0400
 
 pycurl (7.19.5.1-1) unstable; urgency=medium

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