Fixed conflict

Author: Ezra Boley

embedded/app/include/state_machine.h

@@ -37,6 +37,7 @@ typedef struct stateMachine_t stateMachine_t;
 
 state_t *getCurrState(void);
 
+state_t *setCurrState(state_t *state);
 state_t *findState(char *name);
 /*
 * The state machine is a directed graph. Each edge is a transition

embedded/app/src/state_machine.c

@@ -249,10 +249,7 @@ state_t *getCurrState(void);
 state_t *getCurrState() {
     return stateMachine.currState;
 }
-void setCurrState(state_t *state);
-void setCurrState(state_t *state) {
-    stateMachine.currState = state;
-}
+
 /***
  * runStateMachine -
  *		Executes the current states action. A mini control loop

middleware/src/HVTCPSocket.cpp

@@ -18,7 +18,7 @@ extern "C"
 #include "data.h"
 #include "state_machine.h"
 #include "hv_iox.h"
-extern void setCurrState(state_t *state);
+#include "braking.h"
 }