From 2c27067dec7febf5f6dba163d63d97bfd5c3ba1f Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Wed, 15 Jun 2011 15:38:16 -0700 Subject: [PATCH] Fixed typo in merge --- .../CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index f700e6fdb4..20dc639f17 100644 --- 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);