Skip to content

Conversation

@S1ngS1ng
Copy link
Contributor

@S1ngS1ng S1ngS1ng commented Aug 3, 2018

Revert changes for the following file in #53 (non related changes according to PR title)

  • 01-responsive-web-design/responsive-web-design-projects.json
  • 01-responsive-web-design/responsive-web-design-projects.md

Should resolve conflicts in #42 and #39

@S1ngS1ng S1ngS1ng added the ready for review Use when a translation (?) PR is ready for review label Aug 3, 2018
@wudifeixue
Copy link

你这是出冲突了么居然又要revert?

@S1ngS1ng
Copy link
Contributor Author

S1ngS1ng commented Aug 3, 2018

@wudifeixue 主要是那个 pr 改了不该改的文件。所以导致其他的 pr 里有 conflicts

@wudifeixue
Copy link

汗,那还犹豫啥,merge吧

@S1ngS1ng S1ngS1ng merged commit f0290e4 into FreeCodeCampChina:translate Aug 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready for review Use when a translation (?) PR is ready for review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants