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

[Vangelis Mouhtsis]

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

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

commit 33404f65dc9e1d6e9e5369835eca67dc5eb4c565
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Sat Jul 8 20:29:27 2017 +0300

    debian/control: Bump Standards-Version: to 4.0.0. No changes needed.
    
    	modified:   debian/control
---
 debian/control | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/control b/debian/control
index c12aae5..8a561ff 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,13 @@ 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