Commit 5c1e2284 authored by Phillip Schröder's avatar Phillip Schröder

löse merge Konflikt per Hand

parent e67b8b87
......@@ -14,7 +14,7 @@ hello world \\
\par
hello wörld\\
%ändere Zeile 17 Client2
\today \\
\glqq Anführungszeichen\grqq{} blabla
\end{document}
......
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