Skip to content
This repository has been archived by the owner on Jan 22, 2020. It is now read-only.

Commit

Permalink
I resolve merge conflict gud
Browse files Browse the repository at this point in the history
  • Loading branch information
tekkub committed Nov 3, 2009
1 parent d839bee commit 982afec
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion oUF_HealComm4.lua
Expand Up @@ -35,7 +35,6 @@ local function Update(self)
if maxHP == 0 or maxHP == 100 then return Hide(self) end

local guid = UnitGUID(self.unit)
local incHeals = healcomm:GetHealAmount(guid, healcomm.ALL_HEALS) or 0
local incHeals = self.HealCommOthersOnly and healcomm:GetOthersHealAmount(guid, healcomm.ALL_HEALS) or not self.HealCommOthersOnly and healcomm:GetHealAmount(guid, healcomm.ALL_HEALS) or 0
if incHeals == 0 then return Hide(self) end

Expand Down

0 comments on commit 982afec

Please sign in to comment.