From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 OpenSim/Tests/Common/Mock/TestScene.cs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'OpenSim/Tests/Common/Mock/TestScene.cs')

diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index e559871..45acf91 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -34,10 +34,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
-<<<<<<< HEAD
 using OpenSim.Services.Interfaces;
-=======
->>>>>>> avn/ubitvar
 
 namespace OpenSim.Tests.Common
 {
-- 
cgit v1.1