From 89ce5307af89b0fd39da9413904dc0022aa11cb8 Mon Sep 17 00:00:00 2001
From: Patrick Amrhein <patrick.amrhein@t-online.de>
Date: Wed, 17 Jan 2024 12:25:47 +0100
Subject: [PATCH] Merge

---
 src/defines.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/defines.h b/src/defines.h
index b5ed892f..528aa714 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -13,11 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-<<<<<<< HEAD
-#define VERSION_PATCH       560001
-=======
 #define VERSION_PATCH       57
->>>>>>> f503516c9feba7a7cc6fb427954165ce05cd7746
 
 //-------------------------------------
 typedef struct {