Remove version control marker
This commit is contained in:
parent
2e0cf9e7d0
commit
1a8eb0ff8e
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user