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/Framework/AssetBase.cs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'OpenSim/Framework/AssetBase.cs')

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 3937d9c..33be612 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -150,12 +150,8 @@ namespace OpenSim.Framework
                      Type == (sbyte)AssetType.Folder ||
                      Type == (sbyte)AssetType.ImageJPEG ||
                      Type == (sbyte)AssetType.ImageTGA ||
-<<<<<<< HEAD
-                     Type == (sbyte)AssetType.LSLBytecode);
-=======
                      Type == (sbyte)AssetType.Mesh ||
                      Type == (sbyte) AssetType.LSLBytecode);
->>>>>>> avn/ubitvar
             }
         }
 
-- 
cgit v1.1