Resolved merge conflict

diff --cc Config.h
index af7dff8a2b5836b4269ce812fdd1894966b244a8,116ade9531e0eb25a776b1e12b496c9a04a4a1c6..e729380d2065695d848aa320f080b350b6452e2a
--- 1/Config.h
--- 2/Config.h
+++ b/Config.h
@@@ -4,9 -4,10 +4,10 @@@
        #define CONFIG_H
  
        #define MAJ_VERS  0x01
 -      #define MIN_VERS  0x11
 +      #define MIN_VERS  0x12
  
        #define MCU_1284P 0x91
+       #define MCU_2560  0x92
  
        #define MODE_HOST 0x11
        #define MODE_TNC  0x12