From ff29c3136c61691a0ed6cec9b5705301ef502759 Mon Sep 17 00:00:00 2001
From: wiebel <git@wiebel.org>
Date: Wed, 22 Mar 2017 16:32:59 +0100
Subject: [PATCH] Revert "mirror test"

This reverts commit f052826ef3645006a35cdb1b423a686126aebfa9.
---
 src/CANNode.h | 3 +++
 1 file changed, 3 insertions(+)

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