oups !

2022-01-21 15:00:35 +01:00 · 2022-01-21 15:00:35 +01:00 · af7266eb30
parent 0dee6e0e46
commit af7266eb30
1 changed files with 0 additions and 4 deletions
--- a/floatimg.h
+++ b/floatimg.h
@ -4,11 +4,7 @@
 *	http://la.buvette.org/photos/cumul
 */

-<<<<<<< HEAD
-#define		FIMG_VERSION	165
-=======
 #define		FIMG_VERSION	166
->>>>>>> c61251ad53e2b379dde2d441a55d3db0d93adf85

 /*
 *	in memory descriptor