From e3332f0df7bbd6ea3dd1b0b4e0bb0003adbf74d9 Mon Sep 17 00:00:00 2001 From: Alex Shubert Date: Thu, 19 Apr 2012 19:32:52 +0400 Subject: [PATCH] merge commit 2 --- AutoTurnIn.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/AutoTurnIn.lua b/AutoTurnIn.lua index f3fb782..b3ae7fc 100644 --- a/AutoTurnIn.lua +++ b/AutoTurnIn.lua @@ -38,12 +38,7 @@ end function AutoTurnIn:OnEnable() if (not AutoTurnInCharacterDB) or (not AutoTurnInCharacterDB.version or (AutoTurnInCharacterDB.version < TOCVersion)) then AutoTurnInCharacterDB = nil -<<<<<<< HEAD self:Print(L["reset"]) -======= - _G.AutoTurnInDB = {version = vers} - self:Print(INSTANCE_RESET_SUCCESS:format(GAMEOPTIONS_MENU)) ->>>>>>> 7126ee301cc5a09eff9a8b8d804db1220eaf89cd end if not AutoTurnInCharacterDB then -- 1.7.9.5