Skip to content
Snippets Groups Projects
Commit 2c5c3661 authored by Dario Wagner's avatar Dario Wagner
Browse files

Merge branch 'master' into 'auhur' 

garkein bock

# Conflicts:
#   README.md
parents 473b7efb ac3c4075
No related branches found
No related tags found
1 merge request!3stinkedario
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
README.md
+ 4
− 2
View file @ 2c5c3661
<<<<<<< README.md
Jordan stinkt
Dario am meisten
\ No newline at end of file
alle stinken
>>>>>>> README.md
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment