Remove mess sourcetree left

DeadlyBossMods · Jan 5, 2021 · 7a1dd03 · 7a1dd03
1 parent 606bd39
commit 7a1dd03
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/DBM-Challenges/Shadowlands/Torghast.lua b/DBM-Challenges/Shadowlands/Torghast.lua
@@ -52,12 +52,8 @@ local specWarnConflagrate			= mod:NewSpecialWarningInterrupt(270248, "HasInterru
 local specWarnFireballVolley		= mod:NewSpecialWarningInterrupt(270348, "HasInterrupt", nil, nil, 1, 2)
 local specWarnTerrifyingRoar		= mod:NewSpecialWarningInterrupt(263085, "HasInterrupt", nil, nil, 1, 2)
 local specWarnCurseofFrailty		= mod:NewSpecialWarningInterrupt(294526, "HasInterrupt", nil, nil, 1, 2)
-<<<<<<< HEAD
 local specWarnFearsomeHowl			= mod:NewSpecialWarningInterrupt(298844, "HasInterrupt", nil, 2, 1, 2)
-=======
 local specWarnFearsomeShriek		= mod:NewSpecialWarningInterrupt(332165, "HasInterrupt", nil, nil, 1, 2)
-local specWarnFearsomeHowl			= mod:NewSpecialWarningInterrupt(298844, "HasInterrupt", nil, nil, 1, 2)
->>>>>>> 624e76f11952e3716c981774d69d051492ee8551
 local specWarnPhasingRoar			= mod:NewSpecialWarningInterrupt(294517, "HasInterrupt", nil, nil, 1, 2)
 local specWarnDeathBlast			= mod:NewSpecialWarningInterrupt(296839, "HasInterrupt", nil, nil, 1, 2)
 local specWarnAccursedStrength		= mod:NewSpecialWarningInterrupt(294165, "HasInterrupt", nil, nil, 1, 2)