[Python-modules-commits] [python-model-mommy] 01/01: Revert merge failure

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository python-model-mommy.

commit b5e2dce486e1a11e8a8848d747efcb6c0078268e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 31 14:40:42 2016 +0200

    Revert merge failure
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9a5ad4f..18113fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,4 @@
 python-model-mommy (1.2.6-1) unstable; urgency=medium
-  * Team upload
 
   * Team upload
 

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