[SCM] python-pyo/master: Fix changelog.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bc32f5ddbedd09820c4b80d93956073bca240509
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Tue Jul 28 17:26:34 2015 -0400

    Fix changelog.

diff --git a/debian/changelog b/debian/changelog
index 438dfc0..336085d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ python-pyo (0.7.6-1) unstable; urgency=medium
   * New upstream release.
 
  -- Tiago Bortoletto Vaz <tiago at debian.org>  Tue, 28 Jul 2015 17:02:57 -0400
->>>>>>> d32d0500b54a537cd13b6e385668d1ee818652e9
 
 python-pyo (0.7.5-1) experimental; urgency=medium
 

-- 
python-pyo packaging