Add ZJUSCT

[psjnek]

Your Organization: ZJUSCT
GitHub Organization url: @ZJUSCT
Country/Locality: Zhejiang, China
Link: https://www.zjusct.io/

Inclusion requirements:

• Referenced account is an Organization not a User^
• If this is a government project, your Organization's description should include a reference to your country/agency.
• Make sure your Organization includes at least one public repository
• Please also include a URL for your organization that links back to your organization or agency homepage.

❤️ GitHub Government Contributors

[mlinksva]

@WebSnke do you see a "resolve conflicts" button like this?

This usually occurs when git can't tell if a line should be added or replaced. In this repo almost always added, as in this PR. If you can resolve the conflict that would be helpful. See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

[psjnek]

@WebSnke do you see a "resolve conflicts" button like this?

This usually occurs when git can't tell if a line should be added or replaced. In this repo almost always added, as in this PR. If you can resolve the conflict that would be helpful. See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

Thanks, I just resolved the issue.

[mlinksva]

Thanks. Some of your other unmerged PRs also have conflicts.

[psjnek]

Thanks. Some of your other unmerged PRs also have conflicts.

Thanks, I just resolved all of them.