diff --git a/src/CANNode.h b/src/CANNode.h index 83765fe..3fb600f 100644 --- a/src/CANNode.h +++ b/src/CANNode.h @@ -51,4 +51,7 @@ typedef struct outputs_t { bool invert; } outputs_t; #endif +<<<<<<< HEAD // mirror test 02 +======= +>>>>>>> parent of f052826... mirror test