Skip to content

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
merged 2 commits into from
May 11, 2017

Conversation

orcutt989
Copy link
Contributor

@orcutt989 orcutt989 commented May 11, 2017

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
@niccokunzmann
Copy link
Member

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

@niccokunzmann
Copy link
Member

Do you also see this button?
grafik

@orcutt989
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
Copy link
Member

niccokunzmann commented May 11, 2017

I prefer this one.
I will merge it.

@niccokunzmann niccokunzmann merged commit ac020c1 into CoderDojoPotsdam:master May 11, 2017
@niccokunzmann niccokunzmann mentioned this pull request May 14, 2017
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants