remove some conflict indicators.
authorOwen Taylor <otaylor@redhat.com>
Thu, 20 Dec 2001 05:28:37 +0000 (05:28 +0000)
committerOwen Taylor <otaylor@src.gnome.org>
Thu, 20 Dec 2001 05:28:37 +0000 (05:28 +0000)
commitf3eaf11d3caad76ff9afb4e15d505292fe201f45
tree8678e59fa98a6b955f718c509c93ee2aeb4f7212
parentd35880bc3423e0547ee84e555b6efc7678cd3bab
remove some conflict indicators.

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