diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-12-20 05:28:37 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-12-20 05:28:37 +0000 |
| commit | f3eaf11d3caad76ff9afb4e15d505292fe201f45 (patch) | |
| tree | 8678e59fa98a6b955f718c509c93ee2aeb4f7212 /docs | |
| parent | d35880bc3423e0547ee84e555b6efc7678cd3bab (diff) | |
| download | atk-f3eaf11d3caad76ff9afb4e15d505292fe201f45.tar.gz | |
remove some conflict indicators.
Thu Dec 20 00:27:01 2001 Owen Taylor <otaylor@redhat.com>
* docs/tmpl/atkutil.sgml: remove some conflict
indicators.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/tmpl/atkutil.sgml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docs/tmpl/atkutil.sgml b/docs/tmpl/atkutil.sgml index a830ab7..98474b7 100644 --- a/docs/tmpl/atkutil.sgml +++ b/docs/tmpl/atkutil.sgml @@ -14,9 +14,6 @@ AtkUtil </para> -<<<<<<< atkutil.sgml -======= - <!-- ##### STRUCT AtkUtil ##### --> <para> @@ -65,9 +62,6 @@ AtkUtil @object: -<<<<<<< atkutil.sgml -======= - <!-- ##### USER_FUNCTION AtkEventListener ##### --> <para> |