[caja] 01/02: Revert "debian/control: Rename pretty name of our team -> Debian+Ubuntu MATE Packaging Team."

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository caja.

commit 55ce594ce699a9f7a384d47fe744d96ece12d364
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jan 13 14:08:35 2018 +0100

    Revert "debian/control: Rename pretty name of our team -> Debian+Ubuntu MATE Packaging Team."
    
    This reverts commit 2c7077be25c024ccb61818e4b9662e24c9bf37e9.
---
 debian/control | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/control b/debian/control
index c7cc6fb..2c095c8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,7 @@
 Source: caja
 Section: utils
 Priority: optional
-<<<<<<< HEAD
 Maintainer: Debian+Ubuntu Mate Packaging Team <debian-mate at lists.debian.org>
-=======
-Maintainer: Debian+Ubuntu MATE Packaging Team <pkg-mate-team at lists.alioth.debian.org>
->>>>>>> parent of 018cb9e... debian/control: Rename pretty name of our team -> Debian+Ubuntu Mate Packaging Team.
 Uploaders: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>,
            Stefano Karapetsas <stefano at karapetsas.com>,
            Mike Gabriel <sunweaver at debian.org>,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja.git