[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, experimental, updated. debian/1.7.6-1-1-g9ccc75f

[Iain Lane]

The following commit has been merged in the experimental branch:
commit 9ccc75f8cf4e9c11e772190cac12a1fbda7adba0
Author: Iain Lane <laney at debian.org>
Date:   Tue Sep 20 00:14:47 2011 +0100

    Remove merge conflict marker in debian/changelog

diff --git a/debian/changelog b/debian/changelog
index b367dff..74bad07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -201,7 +201,6 @@ tomboy (1.3.1-1) experimental; urgency=low
   * [2fe5306] Increase Standards-Version to 3.9.0, no changes required
 
  -- Iain Lane <laney at ubuntu.com>  Sun, 04 Jul 2010 19:07:59 +0100
->>>>>>> master-devel
 
 tomboy (1.2.1-1) unstable; urgency=low
 

-- 
Tomboy - desktop note taking program using Wiki style links