summaryrefslogtreecommitdiff
path: root/docs/reference/gtk/tmpl/gtktreestore.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'docs/reference/gtk/tmpl/gtktreestore.sgml')
-rw-r--r--docs/reference/gtk/tmpl/gtktreestore.sgml7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index 39832d3b9..d53f2a95d 100644
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -209,6 +209,10 @@ drop</link> interfaces.
@b:
+<<<<<<< gtktreestore.sgml
+=======
+
+
<!-- ##### FUNCTION gtk_tree_store_move_before ##### -->
<para>
@@ -229,3 +233,6 @@ drop</link> interfaces.
@position:
+>>>>>>> 1.16
+
+