From: Mark Qvist <mark@unsigned.io>
Date: Sat, 8 Jan 2022 13:35:48 +0000 (+0100)
Subject: Resolved merge conflict
X-Git-Url: https://git.tnoah.ca/?a=commitdiff_plain;h=9ee61ee95f93f8456699fbb84e3981d32f0b6ff5;p=lora-radio.git

Resolved merge conflict
---

9ee61ee95f93f8456699fbb84e3981d32f0b6ff5
diff --cc Config.h
index af7dff8,116ade9..e729380
--- a/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