[mate-menu] 01/03: Revert "debian/control: Bump Standards-Version: to 4.0.0. No changes needed."

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository mate-menu.

commit a82d05d9a03fb80e89d3a2d81d8a84adb726ac70
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 25 11:27:06 2017 +0200

    Revert "debian/control: Bump Standards-Version: to 4.0.0. No changes needed."
    
    This reverts commit 33404f65dc9e1d6e9e5369835eca67dc5eb4c565.
---
 debian/control | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/control b/debian/control
index 8a561ff..c12aae5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,8 @@ Build-Depends: debhelper (>= 10.3~),
                python,
                python-setuptools,
                python-distutils-extra,
-<<<<<<< HEAD
 Standards-Version: 3.9.8
 Homepage: https://github.com/ubuntu-mate/mate-menu/
-=======
-Standards-Version: 4.0.0
-Homepage: https://bitbucket.org/ubuntu-mate/mate-menu/
->>>>>>> 112ca53... debian/control: Bump Standards-Version: to 4.0.0. No changes needed.
 Vcs-Browser: https://anonscm.debian.org/git/pkg-mate/mate-menu.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-mate/mate-menu.git
 X-Python-Version: >= 2.4

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