[gtkmm] Fix a merge conflict error.

[Murray Cumming <murrayc src gnome org>]

commit 73a20ee2f0612d7a4982dfd0d6d5ee9cb56b33dc
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Sep 25 15:40:03 2010 +0200

    Fix a merge conflict error.

 gtk/src/accelgroup.hg    |    2 +-
 gtk/src/gtk_signals.defs |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/gtk/src/accelgroup.hg b/gtk/src/accelgroup.hg
index 38f1c42..45786d8 100644
--- a/gtk/src/accelgroup.hg
+++ b/gtk/src/accelgroup.hg
@@ -117,7 +117,7 @@ public:
 
   //TODO: The C type is unpleasant:
   //This has C docs, but it isn't worth mentioning them for such a useless signal. murrayc.
-  _WRAP_SIGNAL(void accel_changed(guint keyval, Gdk::ModifierType modifier, GClosure* accel_closure), "accel_changed")
+  _WRAP_SIGNAL(void accel_changed(guint keyval, Gdk::ModifierType modifier, GClosure* accel_closure), "accel_changed", no_default_handler)
   
   _WRAP_PROPERTY("is-locked", bool)
   _WRAP_PROPERTY("modifier-mask", Gdk::ModifierType)
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index db25671..e985863 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -6141,7 +6141,6 @@
   (construct-only #f)
 )
 
->>>>>>> f195434... CellEditable: Added editing_canceled property.
 ;; From GtkCellLayout
 
 ;; From GtkCellRenderer