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

Merge branch 'auhur' into 'master' 

stinkedario

See merge request !3
parents ac3c4075 2c5c3661
Branches master
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 @ 74325a34
<<<<<<< README.md
Jordan stinkt
Daniel auch
\ 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