[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=7c3b54b

The following commit has been merged in the master branch:
commit 7c3b54b45a6de0e5b9f764714d048ede1d1bed44
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Jan 19 13:44:02 2010 +0000

    remove line from merges
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 08c0bcd..2803630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,7 +84,6 @@ kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
 
  -- Scott Kitterman <scott at kitterman.com>  Sat, 05 Dec 2009 23:30:01 -0500
 
->>>>>>> MERGE-SOURCE
 kdeplasma-addons (4:4.3.3-0ubuntu1) lucid; urgency=low
 
   * New upstream release

-- 
KDE Plasma Addons module packaging