From f643dab32d12c5a2a304630f07d3cdcb825ff8ce Mon Sep 17 00:00:00 2001
From: Fenrisul <mitch@xdtech.net>
Date: Thu, 4 Sep 2014 05:39:08 -0700
Subject: [PATCH] Fixed accidental remerge

---
 spine-csharp/src/Bone.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spine-csharp/src/Bone.cs b/spine-csharp/src/Bone.cs
index 636b064bc..fdad97882 100644
--- a/spine-csharp/src/Bone.cs
+++ b/spine-csharp/src/Bone.cs
@@ -42,7 +42,6 @@ namespace Spine {
 		internal float x, y, rotation, rotationIK, scaleX, scaleY;
 		internal float m00, m01, m10, m11;
 		internal float worldX, worldY, worldRotation, worldScaleX, worldScaleY;
-		internal bool flipX, flipY;
 
 		public BoneData Data { get { return data; } }
 		public Skeleton Skeleton { get { return skeleton; } }