mirror of https://github.com/GNOME/gimp.git
missed a CVS conflict indicator
This commit is contained in:
parent
737aa1a0de
commit
9b9464963a
|
@ -435,7 +435,6 @@ Fri Mar 12 21:30:57 GMT 1999 Andy Thomas <alt@gimp.org>
|
|||
Thanks to Tan Koan-Sin <freedom@csie.nctu.edu.tw> for pointing
|
||||
this out.
|
||||
|
||||
>>>>>>> 1.923
|
||||
Fri Mar 12 22:15:49 CET 1999 Marc Lehmann <pcg@goof.com>
|
||||
|
||||
* libgimp/gimp.c: split gimp_quit into two functions, gimp_quit
|
||||
|
|
Loading…
Reference in New Issue