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

[Vangelis Mouhtsis]

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

gnugr-guest pushed a commit to branch master
in repository caja.

commit 2c7077be25c024ccb61818e4b9662e24c9bf37e9
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Sat Jan 13 13:06:22 2018 +0200

    debian/control: Rename pretty name of our team -> Debian+Ubuntu MATE Packaging Team.
---
 debian/control | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/control b/debian/control
index 2c095c8..c7cc6fb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,11 @@
 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