[gtk+/extended-layout-jhs: 64/64] Fixed left-over from merge-conflict

[Johannes Schmid <jhs src gnome org>]

commit 146d84078310f1d9c45398d2fec612bd55f8b9e5
Author: Johannes Schmid <jhs gnome org>
Date:   Wed Nov 25 12:15:49 2009 +0100

    Fixed left-over from merge-conflict

 gtk/gtkcellview.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 4ac8f2c..f2baaac 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1105,9 +1105,6 @@ gtk_cell_view_cell_layout_get_cells (GtkCellLayout *layout)
   return gtk_cell_view_get_cell_renderers (GTK_CELL_VIEW (layout));
 }
 
-
-<<<<<<< HEAD:gtk/gtkcellview.c
-=======
 static gboolean
 gtk_cell_view_buildable_custom_tag_start (GtkBuildable  *buildable,
 					  GtkBuilder    *builder,