Revert "mirror test"

This reverts commit f052826ef3645006a35cdb1b423a686126aebfa9.
2017-03-22 16:32:59 +01:00 · 2017-03-22 16:32:59 +01:00 · ff29c3136c
commit ff29c3136c
parent 3c126f2b7b
1 changed files with 3 additions and 0 deletions
--- 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