This PR to finish off tr-ifying the game.

overbound / SonicTimeTwisted

Source Code for a Sonic Fan Game Made in Game Maker Studio

https://overboundstudio.com/

GNU General Public License v3.0

60 stars 16 forks source link

This PR to finish off tr-ifying the game. #103

Closed nkrapivin closed 3 years ago

nkrapivin commented 3 years ago

Oh, there are merge conflicts?

AlexKhayrullin commented 3 years ago

Just Git being Git and having trouble keeping up with how big SonicTimeTwisted.project.gmx is getting. If you run the "before" and "after" versions of the file in a diff tool such as Meld, you'll see how ridiculous is it that Git considers this a conflict.