remove conflict marker

diff --git a/ChangeLog b/ChangeLog
index ca4c76331b46daaecec3c029b5b4d3de7a1bd58c..132df9cdaa391ac59ae485ce50ec00c26c010af3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
        _gtk_window_activate_key(), gtk_bindings_activate_event().
 
->>>>>>> 1.3066
 Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ca4c76331b46daaecec3c029b5b4d3de7a1bd58c..132df9cdaa391ac59ae485ce50ec00c26c010af3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
        _gtk_window_activate_key(), gtk_bindings_activate_event().
 
->>>>>>> 1.3066
 Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ca4c76331b46daaecec3c029b5b4d3de7a1bd58c..132df9cdaa391ac59ae485ce50ec00c26c010af3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
        _gtk_window_activate_key(), gtk_bindings_activate_event().
 
->>>>>>> 1.3066
 Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ca4c76331b46daaecec3c029b5b4d3de7a1bd58c..132df9cdaa391ac59ae485ce50ec00c26c010af3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
        _gtk_window_activate_key(), gtk_bindings_activate_event().
 
->>>>>>> 1.3066
 Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ca4c76331b46daaecec3c029b5b4d3de7a1bd58c..132df9cdaa391ac59ae485ce50ec00c26c010af3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
        _gtk_window_activate_key(), gtk_bindings_activate_event().
 
->>>>>>> 1.3066
 Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ca4c76331b46daaecec3c029b5b4d3de7a1bd58c..132df9cdaa391ac59ae485ce50ec00c26c010af3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
        _gtk_window_activate_key(), gtk_bindings_activate_event().
 
->>>>>>> 1.3066
 Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ca4c76331b46daaecec3c029b5b4d3de7a1bd58c..132df9cdaa391ac59ae485ce50ec00c26c010af3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use
        _gtk_window_activate_key(), gtk_bindings_activate_event().
 
->>>>>>> 1.3066
 Thu Feb 21 12:24:22 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds