projects / platform / upstream / atk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 16b3856)
Removed conflict indicators from ChangeLog.
authorBill Haneman <billh@src.gnome.org>
Wed, 20 Nov 2002 17:10:51 +0000 (17:10 +0000)
committerBill Haneman <billh@src.gnome.org>
Wed, 20 Nov 2002 17:10:51 +0000 (17:10 +0000)
ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index e51586a..18851f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,6 @@
        * docs/tmpl/atkhyperlink.sgml docs/tmpl/atkobject.sgml
        Update docs.
 
->>>>>>> 1.223
 2002-11-14  Bill Haneman <bill.haneman@sun.com>
 
        * configure.in:
Domain: UI Framework / Assistive Technology;