conflict remnant

-Yosh
1999-10-26 05:42:47 +00:00 · 1999-10-26 05:42:47 +00:00 · 8208cb72bd
parent fcd40fd173
commit 8208cb72bd
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@ -297,7 +297,6 @@ Thu Oct 19 05:30:11 BST 1999 Nick Lamb <njl195@zepler.org>

 	* app/image_new.c: Still using RGB_IMAGE instead of GIMAGE (!)
 	
->>>>>>> 1.1725
 Mon Oct 18 21:24:47 BST 1999 Andy Thomas <alt@gimp.org>

 	* app/bezier_select.c