Remove version control marker

This commit is contained in:
jacob.eva 2024-09-17 16:21:47 +01:00
parent 2e0cf9e7d0
commit 1a8eb0ff8e
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E

View File

@ -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) {