Closed Harrycheng233 closed 5 months ago
@Harrycheng233 @unicar9 @sproutleaf There's a merge conflict here, please do have a look. Thanks.
@Harrycheng233 @unicar9 @sproutleaf There's a merge conflict here, please do have a look. Thanks.
@Harrycheng233 is unable to resolve the conflicts (error message below). Would it be better to delete the existing file and push a new file in 2 separate PRs?
@sproutleaf I think I know what's up here, I changed the language code used in this repo from zh
to zh-Hans
which likely caused the conflict here with git not able to find the file being changed in this PR. I can resolve this and merge, no worries.
Resolves #[Add issue number here]
Changes:
Screenshots of the change:
PR Checklist
npm run lint
passes