version bump

softwarecrash · Mar 25, 2024 · 0fa10d8 · 0fa10d8
1 parent a56dad0
commit 0fa10d8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -18,11 +18,7 @@ monitor_filters = esp8266_exception_decoder, default, time, printable, colorize
 board_build.ldscript = eagle.flash.4m.ld	; 4MB (FS:4MB OTA:~3600KB)
 upload_speed = 921600
 
-<<<<<<< HEAD
-custom_prog_version = 1.1.4-IP65-v2
-=======
 custom_prog_version = 1.1.5A4
->>>>>>> e8fbd3f243bcadc805e7e09000e02feb4b25535d
 
 build_flags = 
 			-DVERSION=${this.custom_prog_version}