Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Or make it more English Friendly #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niccokunzmann merged 2 commits into CoderDojoPotsdam:master from orcutt989:patch-3
May 11, 2017

Conversation

Copy link
Contributor

@orcutt989 orcutt989 commented May 11, 2017 •
edited
Loading

More English-friendly version.

for #37 and #29 

More English-friendly version.
@orcutt989 orcutt989 changed the title (削除) Update 03-02-or.html (削除ここまで) (追記) Or make it more English Friendly (追記ここまで) May 11, 2017
Copy link
Member

Now, I merged the other pull-request. Would you like to resolve the conflict?

Copy link
Member

Do you also see this button?
grafik

Copy link
Contributor Author

Thanks - I gave you 2 options though for your tutorial. This option is more complicated and changes it. I left it up to you which one you wanted to merge. The previous one leaves it with German words which is fine, it just needs additional instruction. This one is more generalized for English competency. Which one do you prefer?
niccokunzmann reacted with thumbs up emoji

Copy link
Member

niccokunzmann commented May 11, 2017 •
edited
Loading

I prefer this one.
I will merge it.
orcutt989 reacted with thumbs up emoji

@niccokunzmann niccokunzmann merged commit ac020c1 into CoderDojoPotsdam:master May 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /