[SCM] mate-control-center Debian package branch, wheezy-bpo, updated. debian/1.8.1+dfsg1-3_bpo70+1-4-gdd8e703

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-control-center.git;a=commitdiff;h=da2f1fe

The following commit has been merged in the wheezy-bpo branch:
commit da2f1fee5c55be9796b6e856f6c8876293e010d7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 1 20:01:57 2014 +0200

    upload to unstable (debian/1.8.1+dfsg1-4)
---
 debian/changelog | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b1204d..54ca62e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,21 @@
-<<<<<<< HEAD
-mate-control-center (1.8.1+dfsg1-3~bpo70+1) wheezy-backports; urgency=low
+mate-control-center (1.8.1+dfsg1-3~bpo70+1) UNRELEASED; urgency=low
 
   * Upload to wheezy-backports.
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 08 May 2014 21:43:48 +0200
-=======
+
 mate-control-center (1.8.1+dfsg1-4) unstable; urgency=medium
 
   * debian/control:
     + Add D (mate-control-center): marco-common. (Closes: #751944).
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 01 Jul 2014 19:51:55 +0200
->>>>>>> ae8fcb7... upload to unstable (debian/1.8.1+dfsg1-4)
+
+mate-control-center (1.8.1+dfsg1-3~bpo70+1) wheezy-backports; urgency=low
+
+  * Upload to wheezy-backports.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Thu, 08 May 2014 21:43:48 +0200
 
 mate-control-center (1.8.1+dfsg1-3) unstable; urgency=low
 

-- 
mate-control-center Debian package