1 files changed, 0 insertions, 3 deletions

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
 {