[Pkg-maemo-commits] r4 ./hildon-icons/debian: really fix merge

[Riku Voipio]

------------------------------------------------------------
revno: 4
committer: Riku Voipio <riku.voipio at iki.fi>
branch nick: debian
timestamp: Tue 2008-01-01 00:53:37 +0200
message:
  really fix merge
modified:
  debian/changelog
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-12-31 14:26:34 +0000
+++ b/debian/changelog	2007-12-31 22:53:37 +0000
@@ -68,5 +68,3 @@
   * Updated for maemo 1.1 
 
  -- Maemo Integration <integration at maemo.org>  Fri, 30 Sep 2005 15:53:42 +0300
-
->>>>>>> MERGE-SOURCE