mirror of
https://github.com/Ryujinx/GtkSharp.git
synced 2025-01-11 21:25:39 +00:00
Remove conflict marker.
svn path=/trunk/gtk-sharp/; revision=16136
This commit is contained in:
parent
aa65123a95
commit
0c4b3dcae1
|
@ -1,4 +1,3 @@
|
|||
<<<<<<< ChangeLog
|
||||
2003-07-12 Duncan Mak <duncan@ximian.com>
|
||||
|
||||
* en/Gtk/TextBuffer.xml: all documented except for events.
|
||||
|
|
Loading…
Reference in a new issue