Commit 9b946496 authored by Michael Natterer's avatar Michael Natterer
Browse files

missed a CVS conflict indicator

parent 737aa1a0
......@@ -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
......
Supports Markdown
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