From 517d25f6a0a24e7659cc0d98ab6317869dd343e3 Mon Sep 17 00:00:00 2001
From: John <johndygit@live.com.ph>
Date: Tue, 1 May 2018 21:58:52 +0800
Subject: [PATCH] [unity] Resolve leftover merge conflict.

---
 spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs b/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs
index b6809872a..f05c50409 100644
--- a/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs	
+++ b/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs	
@@ -968,11 +968,6 @@ namespace Spine.Unity {
 			var vbi = vertexBuffer.Items;
 			var ubi = uvBuffer.Items;
 			var cbi = colorBuffer.Items;
-<<<<<<< HEAD
-=======
-			//var sbi = submeshes.Items;
-			//int submeshCount = submeshes.Count;
->>>>>>> 3.6
 
 			// Zero the extra.
 			{