Commit c3972381 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Remove conflict markers.

parent bf86da9d
Tue Mar 16 00:13:19 2004 Matthias Clasen <maclas@gmx.de>
* gtk/tmpl/gtktreestore.sgml: Remove cvs conflict
markers.
Sun Mar 14 22:27:59 2004 Owen Taylor <otaylor@redhat.com>
* gtk/tmpl/gtktreeview.sgml: Document
......
......@@ -209,10 +209,6 @@ drop</link> interfaces.
@b:
<<<<<<< gtktreestore.sgml
=======
<!-- ##### FUNCTION gtk_tree_store_move_before ##### -->
<para>
......@@ -233,6 +229,3 @@ drop</link> interfaces.
@position:
>>>>>>> 1.16
Supports Markdown
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