[Pkg-maemo-commits] r3 ./hildon-icons/debian: resolve conflict

[Riku Voipio]

------------------------------------------------------------
revno: 3
committer: Riku Voipio <riku.voipio at iki.fi>
branch nick: debian
timestamp: Mon 2007-12-31 16:26:34 +0200
message:
  resolve conflict
modified:
  debian/changelog
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-12-30 13:17:15 +0000
+++ b/debian/changelog	2007-12-31 14:26:34 +0000
@@ -69,3 +69,4 @@
 
  -- Maemo Integration <integration at maemo.org>  Fri, 30 Sep 2005 15:53:42 +0300
 
+>>>>>>> MERGE-SOURCE