Commit 90684dcd authored by Manish Singh's avatar Manish Singh
Browse files

remove silly cvs conflict marker

-Yosh
parent fff35020
......@@ -126,7 +126,6 @@ Sun Aug 27 22:41:36 CEST 2000 Marc Lehmann <pcgqgoof.com>
 
* libgimp/gimp.c: NULL is the default log domain, not "".
 
>>>>>>> 1.2907
2000-08-27 Piers Cornwell <piers.cornwell@bigfoot.com>
 
* plug-ins/Lighting/lighting_ui.c: s/Treshold/Threshold.
......
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