conflict resolution

This commit is contained in:
Thomas Göttgens
2024-10-08 11:41:54 +02:00
11 changed files with 758 additions and 9 deletions
+1
View File
@@ -27,6 +27,7 @@ default_envs = tbeam
;default_envs = meshtastic-dr-dev
;default_envs = m5stack-coreink
;default_envs = rak4631
;default_envs = rak4631_eth_gw
;default_envs = rak2560
;default_envs = rak10701
;default_envs = wio-e5