Commit ca502544 authored by Tim Janik's avatar Tim Janik
Browse files

removed some very old conflict indicators

parent fd536b64
......@@ -153,7 +153,6 @@ Sat Jul 3 16:04:16 PDT 1999 Manish Singh <yosh@gimp.org>
* plug-ins/gfig/gfig.c
* plug-ins/script-fu/script-fu-scripts.c: Include <glib.h> early.
>>>>>>> 1.1251
1999-07-02 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/dodgeburn.c: changed the tool toggle key to <Ctrl>.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment