search

rheirman / WhatTheHack

Mechanoid hacking
16 stars 18 forks source link

New simplified Chinese translation19.5.26 #32

Closed LingLuo39 closed 5 years ago

LingLuo39 commented 5 years ago

New simplified Chinese translation19.5.26

rheirman commented 5 years ago

Can you resolve the conflicts and create a new pull request? If you don't know how to, please let me know. In that case I'll fix them myself by just accepting all changes from your branch, and removing what's conflicting on my master.

rheirman commented 5 years ago

I'm closing the pull request because of the conflicts. Please resolve the conflicts, and make sure your branch is up to date before working on translations next time.

Create a new pull request where you fixed the conflicts please. Contact me if this is unclear.