missed a CVS conflict indicator

9b946496 · Michael Natterer · 737aa1a0 · 9b946496
Commit 9b946496 authored Mar 25, 1999 by Michael Natterer
--- a/ChangeLog
+++ b/ChangeLog
@@ -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