callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed a stray conflict marker from ChangeLog.

Browse Source
This commit is contained in:
Kelly Martin
2000-03-28 15:55:02 +00:00
parent 3b17ab0193
commit 3c764ee891
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -197,7 +197,6 @@ Sat Mar 25 20:57:24 CET 2000 Stanislav Brabec <utx@penguin.cz>
busy. This is not really what we want but at least it prevents busy. This is not really what we want but at least it prevents
crashes. crashes.
>>>>>>> 1.2476
2000-03-25 Sven Neumann <sven@gimp.org> 2000-03-25 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu-console.c: only call gtk_main_quit() * plug-ins/script-fu/script-fu-console.c: only call gtk_main_quit()