From 07429dd23d5e815a90b9f9f27d412233ad59a823 Mon Sep 17 00:00:00 2001 From: James Whitehead II Date: Tue, 2 Jan 2007 16:01:05 +0000 Subject: [PATCH] * Cleaned up a bad merge --- PerfectRaid.lua | 7 ------- 1 file changed, 7 deletions(-) diff --git a/PerfectRaid.lua b/PerfectRaid.lua index df94ed1..e2bb5a0 100644 --- a/PerfectRaid.lua +++ b/PerfectRaid.lua @@ -74,7 +74,6 @@ function PerfectRaid:Enable() self:RegisterEvent("UNIT_MAXFOCUS", "UNIT_MAXMANA") --TODO: Make this so we can actually instantiate frames as the users wants ---[[ for i=1,8 do local name = "PRHeader"..i self.db.profile.headers[name] = setmetatable({}, {__index=self.headerDefaults}) @@ -90,14 +89,8 @@ function PerfectRaid:Enable() PRHeader6:SetPoint("TOP", PRHeader5, "BOTTOM", 0, -20) PRHeader7:SetPoint("TOP", PRHeader6, "BOTTOM", 0, -20) PRHeader8:SetPoint("TOP", PRHeader7, "BOTTOM", 0, -20) -<<<<<<< .mine ---]] - local header = self:CreateRaidFrame("PRHeader1", "1,2,3,4,5,6,7,8", nil, nil, "CLASS", "WARRIOR,PRIEST,PALADIN,DRUID,SHAMAN,ROGUE,MAGE,WARLOCK,HUNTER", 2, 10, "LEFT") - self:RestorePosition("PRHeader1") -======= --local header = self:CreateRaidFrame("PRHeader1", "1,2,3,4,5,6,7,8", nil, nil, "CLASS", "WARRIOR,PRIEST,PALADIN,DRUID,SHAMAN,ROGUE,MAGE,WARLOCK,HUNTER", 2, 10, "LEFT") --self:RestorePosition("PRHeader1") ->>>>>>> .r35 end function PerfectRaid:SavePosition(name) -- 1.7.9.5