Remove conflict marker.

svn path=/trunk/gtk-sharp/; revision=16136
This commit is contained in:
Duncan Mak 2003-07-12 09:23:26 +00:00
parent aa65123a95
commit 0c4b3dcae1

View File

@ -1,4 +1,3 @@
<<<<<<< ChangeLog
2003-07-12 Duncan Mak <duncan@ximian.com>
* en/Gtk/TextBuffer.xml: all documented except for events.