fix wrong file commited

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
     }
 }