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.

Sign up for GitHub

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

Jump to bottom

Krautz branch #4

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

Krautz branch #4

wants to merge 2 commits into from

Conversation

krautzberger
Copy link

Conflicts:

README.md

@krautzberger
Schwert
89dc30d 
Ich habe ein Schwert gebaut :)
@krautzberger
Merge branch 'master' into krautz-branch
f69d312 
# Conflicts:
#	README.md
insa-fuetterer
insa-fuetterer reviewed Apr 5, 2017
View reviewed changes
Copy link

@insa-fuetterer insa-fuetterer left a comment

Choose a reason for hiding this comment

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

Du hast das was sehr schönes gebaut!

insa-fuetterer
insa-fuetterer approved these changes Apr 5, 2017
View reviewed changes
README.md



OXXXX||::::::::::::::::::::::::::>
Copy link

Choose a reason for hiding this comment

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

Ein hübsches Schwert!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@insa-fuetterer insa-fuetterer insa-fuetterer approved these changes

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@krautzberger @insa-fuetterer