fix merge conflict

2020-10-11 21:19:22 -07:00
parent 58cfd1317c
commit 10008d4eef
8 changed files with 118 additions and 94 deletions
@@ -20,6 +20,6 @@
 #define EVENT_POWER_DISCONNECTED 14

 extern Fsm powerFSM;
-extern State statePOWER;
+extern State statePOWER, stateSERIAL;

 void PowerFSM_setup();