From 44c86cedcf8ddba1ca4c9e3ff4f1e39ceb59be06 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Jan 2010 07:42:45 +0000
Subject: Resolve one more conflict I overlooked

---
 .../CoreModules/Scripting/WorldComm/WorldCommModule.cs     | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Scripting')

diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 93aa88c..60df2e7 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -120,20 +120,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             if (maxlisteners < 1) maxlisteners = int.MaxValue;
             if (maxhandles < 1) maxhandles = int.MaxValue;
 
-<<<<<<< HEAD:OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
-            m_listenerManager = new ListenerManager(maxlisteners, maxhandles);
-            m_pendingQ = new Queue();
-            m_pending = Queue.Synchronized(m_pendingQ);
-        }
-
-        public void PostInitialise()
-        {
-        }
-
-        public void AddRegion(Scene scene)
-        {
-=======
->>>>>>> ec3c31e... Updates all IRegionModules to the new style region modules.:OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
             m_scene = scene;
             m_scene.RegisterModuleInterface<IWorldComm>(this);
             m_listenerManager = new ListenerManager(maxlisteners, maxhandles);
-- 
cgit v1.1