From c42df1259fa02aea21817749d65a4e468166c022 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 7 Oct 2012 06:16:47 +0100
Subject:  fix wrong file commited

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 7a3f343..236adb0 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -743,15 +743,5 @@ namespace OpenSim.Region.Physics.Meshing
 
             return mesh;
         }
-<<<<<<< HEAD
-        public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
-        {
-            return null;
-        }
-
-        public void ReleaseMesh(IMesh imesh) { }
-        public void ExpireReleaseMeshs() { }
-=======
->>>>>>> avination
     }
 }
-- 
cgit v1.1