From 1a8eb0ff8e2f0457861693ce7262dc35e804c685 Mon Sep 17 00:00:00 2001
From: "jacob.eva" <x00010@disroot.org>
Date: Tue, 17 Sep 2024 16:21:47 +0100
Subject: [PATCH] Remove version control marker

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

diff --git a/Utilities.h b/Utilities.h
index 2f78928..2878e10 100644
--- a/Utilities.h
+++ b/Utilities.h
@@ -228,7 +228,6 @@ uint8_t boot_vector = 0x00;
 		void led_tx_on()  { digitalWrite(pin_led_tx, HIGH); }
 		void led_tx_off() { digitalWrite(pin_led_tx, LOW); }
 	#endif
->>>>>>> upstream/master
 #endif
 
 void hard_reset(void) {