Commit 5c522908 authored by khenggel's avatar khenggel

second commit for merge conflict

parent 1190a3b0
hoi katharina :)
blablablablabla
sali Lisa \(^.^)/
\ No newline at end of file
sali Lisa \(^.^)/
edit khenggel
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment