[mate-menus] 03/03: debian/changelog: resolve merge conflict

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch master
in repository mate-menus.

commit 3da315e40fd90315c0549d198dba5cd9987b28ff
Merge: e02850a 71a4e06
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Wed Feb 7 18:20:31 2018 +0000

    debian/changelog: resolve merge conflict

 debian/changelog | 10 ++++++++--
 debian/copyright |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 8439a3a,1200aca..86c3987
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,16 @@@
+ mate-menus (1.20.0-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Martin Wimpress <martin.wimpress at ubuntu.com>  Wed, 07 Feb 2018 14:03:56 +0000
+ 
 -mate-menus (1.19.0-1) UNRELEASED; urgency=medium
 +mate-menus (1.18.1-2) unstable; urgency=medium
  
 -  * New upstream release.
 +  * Rename GIR package to match Debian Policy.
 +  * debian/{control,compat}:
 +    + Bump DH version level to 11.
  
 - -- Martin Wimpress <martin.wimpress at ubuntu.com>  Tue, 23 Jan 2018 23:18:19 +0000
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 25 Jan 2018 01:30:43 +0100
  
  mate-menus (1.18.1-1) unstable; urgency=medium
  

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