[glade3/signal-tree-model] gladeui: Fix merge conflicts

[Johannes Schmid <jhs src gnome org>]

commit 64a3068ee0f97c12833b8c5d14e2db098e91674a
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Dec 30 20:33:23 2010 +0100

    gladeui: Fix merge conflicts

 gladeui/glade-editor.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c
index 8bcd6c8..2f5ac55 100644
--- a/gladeui/glade-editor.c
+++ b/gladeui/glade-editor.c
@@ -596,20 +596,12 @@ glade_editor_set_signal_editor (GladeEditor * editor,
 static void
 glade_editor_load_signal_page (GladeEditor * editor)
 {
-<<<<<<< HEAD
-	if (editor->signal_editor == NULL) {
-		editor->signal_editor = glade_signal_editor_new ();
-		gtk_container_add (GTK_CONTAINER (editor->page_signals),
-				   GTK_WIDGET(editor->signal_editor));
-	}
-=======
   if (editor->signal_editor == NULL)
     {
-      editor->signal_editor = glade_signal_editor_new ((gpointer) editor);
+      editor->signal_editor = glade_signal_editor_new ();
       gtk_container_add (GTK_CONTAINER (editor->page_signals),
                          GTK_WIDGET (editor->signal_editor));
     }
->>>>>>> master
 }
 
 static void