Skip to content

Commit 52940b1

Browse files
author
LocalIdentity
committed
Fix conflict
1 parent 2668a92 commit 52940b1

2 files changed

Lines changed: 1 addition & 11 deletions

File tree

src/Modules/CalcSections.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ return {
721721
{ modName = { "CurseDelay" }, cfg = "skill" },
722722
{ modName = { "CurseActivation" }, cfg = "skill" },
723723
} },
724-
{ label = "Curse Limit", haveOutput = "CurseEffectMod", { format = "{0:output:EnemyCurseLimit}",
724+
{ label = "Curse Limit", haveOutput = "EnemyCurseLimit", { format = "{0:output:EnemyCurseLimit}",
725725
{ breakdown = "EnemyCurseLimit" },
726726
{ modName = { "CurseLimitIsMaximumPowerCharges", "EnemyCurseLimit" } },
727727
}, },

src/Modules/CalcSections.lua.rej

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)