From 2f41bc4ca738cd27730639c8cd49a154404c6a82 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 14 Sep 2010 22:14:08 +0100
Subject: Fix merge issues

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index abec699..12c7fea 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1348,15 +1348,12 @@ namespace OpenSim.Region.Framework.Scenes
                     if (m_frame % m_update_presences == 0)
                         m_sceneGraph.UpdatePresences();
 
-<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
                     // Update SceneObjectGroups that have scheduled themselves for updates
                     // Objects queue their updates onto all scene presences
                     if (m_frame % m_update_objects == 0)
                         m_sceneGraph.UpdateObjectGroups();
 
-=======
                     // Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client)
->>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
                     if (m_frame % m_update_coarse_locations == 0)
                     {
                         List<Vector3> coarseLocations;
-- 
cgit v1.1