Skip to content
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

Joanas Branch #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Joanas Branch #10

wants to merge 2 commits into from

Conversation

joanapa
Copy link

@joanapa joanapa commented Apr 5, 2017

Conflicts:

README.md

Joana added 2 commits April 5, 2017 14:32
Ich habe XYZ geändert 🤘🏼
# Conflicts:
#	README.md
@@ -4,3 +4,6 @@ This is a temporary repository
Meine erste Änderung

Meine zweite Änderung

Ich habe etwas geändert, mal schauen, wie es aussieht, ich hoffe es wird schön
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Das ist wirklich sehr schön

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