Quantcast

* Cleaned up a bad merge

James Whitehead II [01-02-07 - 16:01]
* Cleaned up a bad merge
Filename
PerfectRaid.lua
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)