Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 0 insertions, 10 deletions

diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index 93a0bd6..a17eb41 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -717,16 +717,6 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                                 // Delete tree and alert clients (not silent)
                                 m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
                                 copse.m_trees.Remove(selectedTree.ParentGroup.UUID);
-<<<<<<< HEAD:OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
-
-                                m_scene.ForEachClient(delegate(IClientAPI controller)
-                                                          {
-                                                              controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
-                                                                                        new List<uint>() { selectedTree.LocalId });
-                                                          });
-
-=======
->>>>>>> 146322eb34c15a5722cfe42dd012821ddf441fe6:OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
                                 break;
                             }
                         }