resolve merge

Gogo1951 · Nov 14, 2022 · 394ff24 · 394ff24
2 parents be10371 + abcd735
commit 394ff24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/AnnounceReset.lua b/AnnounceReset.lua
@@ -21,7 +21,7 @@ local function AnnounceInstanceReset(_, msg, ...)
                 end
             end
         elseif strmatch(msg, failedreset) then
-            local playersStillInside = " Anyone still inside can exit and re-enter"
+            local playersStillInside = " Any players still inside will need to exit and then re-enter."
             if (UnitIsGroupLeader("player")) then
                 if (IsInRaid()) then
                     SendChatMessage(addon.instanceResetString .. playersStillInside, "RAID")

diff --git a/Groupie.toc b/Groupie.toc
@@ -20,4 +20,4 @@ GroupBrowser.lua
 RightClick.lua
 Listener.lua
 AutoResponse.lua
-AnnounceReset.lua
+AnnounceReset.lua