merge fix

speedwaystar · May 15, 2023 · 9229be7 · 9229be7
1 parent 8d7ca97
commit 9229be7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/localization.en.lua b/localization.en.lua
@@ -43,11 +43,7 @@ SMARTBUFF_UNDEAD    = "Undead";
 SMARTBUFF_CLASSES = {"Druid", "Hunter", "Mage", "Paladin", "Priest", "Rogue", "Shaman", "Warlock", "Warrior", "Death Knight", "Monk", "Demon Hunter", "Evoker", "Hunter Pet", "Warlock Pet", "Death Knight Pet", "Tank", "Healer", "Damage Dealer"};
 
 -- Templates and Instances
-<<<<<<< HEAD
-SMARTBUFF_TEMPLATES = {"Solo", "Party", "LFR", "Raid", "Mythic Keystone", "Battleground", "Arena", "Castle Nathria", "Sanctum of Domination", "Sepulcher of the First Ones", "Vault of the Incarnates", "Aberrus, the Shadowed Crucible", "Custom 1", "Custom 2", "Custom 3", "Custom 4", "Custom 5"};
-=======
 SMARTBUFF_TEMPLATES = {"Solo", "Party", "LFR", "Raid", "Mythic Keystone", "Battleground", "Arena", "Castle Nathria", "Sanctum of Domination", "Sepulcher of the First Ones", "Vault of the Incarnates", "Aberrus, The Shadowed Crucible", "Custom 1", "Custom 2", "Custom 3", "Custom 4", "Custom 5"};
->>>>>>> a895f42a58cb6a146c3802a6291ccc5787258f83
 SMARTBUFF_INSTANCES = {"Castle Nathria", "Sanctum of Domination", "Sepulcher of the First Ones", "Vault of the Incarnates", "Aberrus, the Shadowed Crucible"};
 -- Mount
 SMARTBUFF_MOUNT = "Increases speed by (%d+)%%.";