[maemo-commits] [maemo-commits] r10806 - projects/haf/trunk/hildon-theme-layout-4

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-03-28 14:37:58 +0300 (Wed, 28 Mar 2007)
New Revision: 10806

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
Log:
Fix changelog.



Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-03-28 11:34:04 UTC (rev 10805)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-03-28 11:37:58 UTC (rev 10806)
@@ -25,7 +25,6 @@
 	* rc/themespecificgtk.rc: Adding the DejaVu Sans Condensed as the
 	second font option.
 
->>>>>>> .r10779
 2007-03-23  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
 
 	* data/layout.txt: added thumb-sized scrollbar images, hopefully