Commit e67b8b87 authored by Phillip Schröder's avatar Phillip Schröder

löse merge Konflikt per Hand

parents b11b2379 c70f4636
......@@ -19,5 +19,4 @@ hello wörld\\
\glqq Anführungszeichen\grqq{} blabla
\end{document}
%Client2 schreibt etwas in zeile 23.
\ No newline at end of file
wlkjklwjcwkcjlökjö
\ 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