Fixed typo in merge

2011-06-15 15:38:16 -07:00 · 2011-06-15 15:38:16 -07:00 · 2c27067dec
parent b6d93d0c40
commit 2c27067dec
1 changed files with 0 additions and 1 deletions
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@ -535,7 +535,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            }

            if (upd != null)
-<<<<<<< HEAD
            {
                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, upd.RegionID);