merge artifact

DCC-EX · Feb 20, 2024 · 423d193 · 423d193
1 parent dec39a2
commit 423d193
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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