[eom] 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 eom.

commit 00c1fc1d28f0c9061171edb867c24a35a407ad78
Merge: 90b47be 2247803
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Wed Feb 7 18:16:45 2018 +0000

    debian/changelog: resolve merge conflict

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

diff --cc debian/changelog
index 01d95e1,780f408..d3b1292
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,14 +1,21 @@@
+ eom (1.20.0-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Martin Wimpress <martin.wimpress at ubuntu.com>  Wed, 07 Feb 2018 14:03:57 +0000
+ 
 -eom (1.19.1-1) UNRELEASED; urgency=medium
 +eom (1.18.3-3) unstable; urgency=medium
  
 -  * New upstream release.
 +  * debian/control:
 +    + Fix typo in B:/R: versions for gir1.2-eom. (Closes: #888557).
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Sat, 27 Jan 2018 10:38:00 +0100
 +
 +eom (1.18.3-2) unstable; urgency=medium
 +
 +  * Rename GIR package to match Debian Policy.
  
 - -- Martin Wimpress <martin.wimpress at ubuntu.com>  Wed, 24 Jan 2018 00:50:47 +0000
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 24 Jan 2018 22:19:30 +0100
  
  eom (1.18.3-1) unstable; urgency=medium
  

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