Commit 3cc89fb5 authored by Matt Wilson's avatar Matt Wilson

remove conflict moarker

parent e0094ea9
......@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
......@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
......@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
......@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
......@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
......@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
......@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment