Resolving merge conflicts for dev --> master - Githubissues

egordorichev / LastTry

:deciduous_tree: LastTry is open-source game written in Java, using LibGDX library and inspired by Terraria :deciduous_tree:

MIT License

118 stars 17 forks source link

Resolving merge conflicts for dev --> master #97

Closed Col-E closed 7 years ago

Col-E commented 7 years ago

Overrwrote changes in ChunkIO by https://github.com/egordorichev/LastTry/pull/97/commits/1e8c1f8c9e70a89eede9631348e3897147cdeed8 due to cross-platform solution being given in https://github.com/egordorichev/LastTry/commit/5ea677d63807e394285692efc30569736806322e