Merge branch 'master' into careminster-presence-refactor

1 files changed, 0 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e3f0693..ae48c02 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5165,7 +5165,6 @@ namespace OpenSim.Region.Framework.Scenes
                         });
             }
 
-<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
             if (objectsToDelete.Count > 0)
             {
                 m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
@@ -5175,12 +5174,6 @@ namespace OpenSim.Region.Framework.Scenes
                     DeleteSceneObject(grp, true);
                 }
                 m_log.Debug("[SCENE]: Finished dropped attachment deletion");
-=======
-            foreach (SceneObjectGroup grp in objectsToDelete)
-            {
-                m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
-                DeleteSceneObject(grp, true);
->>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
             }
         }
     }