diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2004-03-16 00:03:59 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-03-16 00:03:59 +0000 |
| commit | c397238109eb3abc855814cb07e931c73b530c5f (patch) | |
| tree | e5cdcf9e1b121d40b2f12010af453f2ad5fa5117 | |
| parent | bf86da9df0fc8297b2b6e6c7ac14c54b9023f6da (diff) | |
| download | gtk+-c397238109eb3abc855814cb07e931c73b530c5f.tar.gz | |
Remove conflict markers.
| -rw-r--r-- | docs/reference/ChangeLog | 5 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtktreestore.sgml | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 91d4a8f7e3..84a8571877 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +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 diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml index d53f2a95d8..39832d3b93 100644 --- a/docs/reference/gtk/tmpl/gtktreestore.sgml +++ b/docs/reference/gtk/tmpl/gtktreestore.sgml @@ -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 - - |