[caja] 03/03: resolve conflict

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch ubuntu/artful
in repository caja.

commit 1f24ec53b9a23eddd3449400e63a1c35275cacfc
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Thu May 11 09:45:08 2017 +0100

    resolve conflict
---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 01459c3..567dac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+caja (1.18.3-0ubuntu1) artful; urgency=medium
+
+  * New upstream maintenance release.
+
+ -- Martin Wimpress <martin.wimpress at ubuntu.com>  Thu, 11 May 2017 07:48:28 +0100
+ 
 caja (1.18.2-0ubuntu1) artful; urgency=medium
 
   * New upstream release.

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