Merge branch 'main' of https://github.com/GreynArtestre/rgmercs-lua

DerpleMQ2 · Dec 23, 2023 · 5234a7b · 5234a7b
2 parents badc7d6 + 4cc7725
commit 5234a7b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/class_configs/shd_class_config.lua b/class_configs/shd_class_config.lua
@@ -502,7 +502,15 @@ return {
             ['Burn'] = 1,
         },
     },
+<<<<<<<<< Temporary merge branch 1
     ['DefaultConfig'] = {
         ['Mode'] = 'Tank',
     },
+=========
+    ['Config'] = {
+        ['Mode'] = 'Tank',
+    },
+
+
+>>>>>>>>> Temporary merge branch 2
 }