remove some conflict indicators.

Thu Dec 20 00:27:01 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/tmpl/atkutil.sgml: remove some conflict
        indicators.

diff --git a/ChangeLog b/ChangeLog
index 7d6605b..27f95be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 20 00:27:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * docs/tmpl/atkutil.sgml: remove some conflict
+       indicators.
+
 2001-12-19  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * atk/atk.def:

diff --git a/docs/tmpl/atkutil.sgml b/docs/tmpl/atkutil.sgml
index a830ab7..98474b7 100644 (file)
--- 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>