[maemo-commits] [maemo-commits] r16830 - projects/haf/trunk/gtk+

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-12-01 16:05:23 +0200 (Mon, 01 Dec 2008)
New Revision: 16830

Modified:
   projects/haf/trunk/gtk+/ChangeLog
Log:
Remove stale conflict markers.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-12-01 11:47:23 UTC (rev 16829)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-12-01 14:05:23 UTC (rev 16830)
@@ -9963,9 +9963,6 @@
 	* modules/printbackend/cups/*.c: Coding style cleanups.
 
 2007-01-03  Matthias Clasen  <mclasen at redhat.com>
-=======
-2008-02-07  Cody Russell  <bratsche at gnome.org>
->>>>>>> 5cc1ee6... 2008-02-08  Sven Herzberg  <sven at imendio.com>:ChangeLog
 
 	* configure.in: Export SED to make sourcing of
 	libtool work. Tighten up the directfb pkgconfig check.