correct merge

User_config.h

@@ -85,15 +85,9 @@ const byte subnet[] = { 255, 255, 255, 0 }; //ip adress
 #else // for arduino + W5100
   #define ZgatewayRF
   #include "config_RF.h"
-<<<<<<< HEAD
   //#define ZgatewayRF2 // too big for UNO
-  #ifdef RFM69_Wiring
-    //#define ZgatewayRFM69 not tested
-    //#include "config_RFM69.h"
-  #endif
-=======
-  #define ZgatewayRF2
->>>>>>> New-wiring
+  //#define ZgatewayRFM69 not tested
+  //#include "config_RFM69.h"
   #define ZgatewayIR
   #include "config_IR.h"
   #define ZgatewayBT