Skip to content

Conversation

@Robin-zero
Copy link
Contributor

No description provided.

huluoyang and others added 6 commits July 18, 2018 08:21
…into translate

# Conflicts:
#	01-responsive-web-design/basic-html-and-html5.json
#	01-responsive-web-design/responsive-web-design-principles.json
#	06-information-security-and-quality-assurance/advanced-express-tools.json
#	06-information-security-and-quality-assurance/helmetjs.json
#	06-information-security-and-quality-assurance/quality-assurance-and-information-security-projects.json
#	06-information-security-and-quality-assurance/testing-with-chai.json
#	README.md
@S1ngS1ng
Copy link
Contributor

@Robin-zero 你现在的历史线有点儿乱了。你在 pull 或者 pull --rebase 的时候没有 resolve conflicts。啥时候有空了微信上找我下

@S1ngS1ng S1ngS1ng added the need update Use when a translation (?) PR has been reviewed and needs to address comments label Jul 24, 2018
@S1ngS1ng S1ngS1ng self-assigned this Jul 24, 2018
@S1ngS1ng
Copy link
Contributor

Close in favor of #21

@S1ngS1ng S1ngS1ng closed this Jul 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

need update Use when a translation (?) PR has been reviewed and needs to address comments

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants