Merge branch 'master' of github.com:Olink/Invincible-Tiles

Zack Piispanen · Zack Piispanen · commit a6ffa8732cd9 · 2013-10-02T16:36:46.000-04:00
Conflicts:
	InvincibleTiles/InvincibleTiles.cs
diff --git a/InvincibleTiles/InvincibleTiles.cs b/InvincibleTiles/InvincibleTiles.cs
@@ -266,4 +266,4 @@ private void TileKill(object sender, GetDataHandlers.TileEditEventArgs args)
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -266,4 +266,4 @@ private void TileKill(object sender, GetDataHandlers.TileEditEventArgs args)`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`	`}`
`269`		`-}`
	`269`	`+}`