From 423d1932ae42035412c4b6c970f2d2d889a91991 Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Tue, 20 Feb 2024 15:08:41 +0100
Subject: [PATCH] merge artifact

---
 version.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/version.h b/version.h
index c3ea9169..dcc7c6ee 100644
--- a/version.h
+++ b/version.h
@@ -33,7 +33,6 @@
 // 5.2.21 - Add STARTUP_DELAY config option to delay CS bootup
 // 5.2.20 - Check return of Ethernet.begin()
 // 5.2.19 - ESP32: Determine if the RMT hardware can handle DCC
->>>>>>> devel
 // 5.2.18 - Display network IP fix
 // 5.2.17 - ESP32 simplify network logic
 // 5.2.16 - Bugfix to allow for devices using the EX-IOExpander protocol to have no analogue or no digital pins