Updated Traditional Chinese (Taiwan) Translations

[alexclassroom]

No description provided.

[GaryJones]

Thanks for the update.

There's a merge conflict which needs to be addressed.

[alexclassroom]

commit ba8bc06 is correct.

[GaryJones]

Check out develop, and ensure it is up to date with upstream/develop (the TGMPA repo should be upstream). Push to your origin.
Then check out on your PR branch, and the rebase it onto develop. Fix the merge conflicts, finish the rebase, and then force push to your origin.

[jrfnl]

@alexclassroom Just checking in as we'd be happy to merge this, but can't as long as the branch is in conflict.
Could you please rebase the branch on the current develop branch as described by @GaryJones in the previous comment ?

[alexclassroom]

Will try to resovle this tomorrow. 在 2018年3月13日 上午2:35 於 上午2:35，Juliette <[email protected]>曾寫：

…

@alexclassroom Just checking in as we'd be happy to merge this, but can't as long as the branch is in conflict. Could you please rebase the branch on the current `develop` branch as described by @GaryJones in the previous comment ? -- You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub: #696 (comment)

[jrfnl]

@alexclassroom Appreciated!