Fix borked GitHub merge

Wires77 · Wires77 · commit 82a25b437712 · 2025-06-13T15:04:34.000-05:00
diff --git a/src/Data/Global.lua b/src/Data/Global.lua
@@ -317,11 +317,7 @@ SkillType = {
 	DisallowTriggerSupports = 134,
 	ProjectileCannotReturn = 135,
 	Offering = 136,
-<<<<<<< 3.26_export
-	SupportByBane = 137,
-=======
 	SupportedByBane = 137,
->>>>>>> dev
 }
 
 GlobalCache = { 
diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua
@@ -124,11 +124,7 @@ local skillTypes = {
 	"DisallowTriggerSupports",
 	"ProjectileCannotReturn",
 	"Offering",
-<<<<<<< 3.26_export
-	"SupportedByBane"
-=======
 	"SupportedByBane",
->>>>>>> dev
 }
 
 -- This is here to fix name collisions like in the case of Barrage
