From af7266eb30c4e0ff559ae8bcec988040fa01cd8f Mon Sep 17 00:00:00 2001
From: tTh <tth@ramen.buvette.org.invalid>
Date: Fri, 21 Jan 2022 15:00:35 +0100
Subject: [PATCH] oups !

---
 floatimg.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/floatimg.h b/floatimg.h
index 6f20c35..9450db2 100644
--- 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