1 files changed, 0 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index 40db370..b209b33 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -60,12 +60,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Tests
             TerrainChannel map = new TerrainChannel((int)Constants.RegionSize, (int)Constants.RegionSize);
             ITerrainPaintableEffect effect = new RaiseSphere();
 
-<<<<<<< HEAD
-            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0);
-=======
             effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0,
                 0, midRegion - 1,0, (int)Constants.RegionSize -1);
->>>>>>> avn/ubitvar
             Assert.That(map[127, midRegion] > 0.0, "Raise brush should raising value at this point (127,128).");
             Assert.That(map[125, midRegion] > 0.0, "Raise brush should raising value at this point (124,128).");
             Assert.That(map[120, midRegion] == 0.0, "Raise brush should not change value at this point (120,128).");
@@ -84,12 +80,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Tests
             }
             effect = new LowerSphere();
 
-<<<<<<< HEAD
-            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0);
-=======
             effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0,
                 0, (int)Constants.RegionSize -1,0, (int)Constants.RegionSize -1);
->>>>>>> avn/ubitvar
             Assert.That(map[127, midRegion] >= 0.0, "Lower should not lowering value below 0.0 at this point (127,128).");
             Assert.That(map[127, midRegion] == 0.0, "Lower brush should lowering value to 0.0 at this point (127,128).");
             Assert.That(map[125, midRegion] < 1.0, "Lower brush should lowering value at this point (124,128).");