[Python-modules-commits] [python-gear] 01/05: Fixed debian/control

[Thomas Goirand]

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

zigo pushed a commit to branch debian/unstable
in repository python-gear.

commit 6c248ceef7edb43bc462e547f4866ea592813df9
Author: Thomas Goirand <thomas at goirand.fr>
Date:   Tue Sep 8 09:39:20 2015 +0000

    Fixed debian/control
---
 debian/control | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 9b75757..ad72de2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,10 @@ Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Antoine Musso <hashar at free.fr>,
            Thomas Goirand <zigo at debian.org>,
-<<<<<<< cc684f08efc58b25e744f6432e82f41937c10ec8
+           Paul Belanger <paul.belanger at polybeacon.com>,
 Build-Depends: debhelper (>= 9),
                dh-python,
-=======
-           Paul Belanger <paul.belanger at polybeacon.com>,
 Build-Depends: debhelper (>= 9),
->>>>>>> Switched to dh 9.
                openstack-pkg-tools,
                python-all,
                python-pbr,

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