löse merge Konflikt per Hand

e67b8b87 · Phillip Schröder · b11b2379 · c70f4636 · e67b8b87 · e67b8b87
Commit e67b8b87 authored Jan 31, 2019 by Phillip Schröder
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Latex/1.tex Latex/1.tex +0 -1

Neues Textdokument - Kopie.txt Neues Textdokument - Kopie.txt +1 -0

No files found.
--- a/Latex/1.tex
+++ b/Latex/1.tex
@@ -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
--- a/Neues Textdokument - Kopie.txt
+++ b/Neues Textdokument - Kopie.txt
+wlkjklwjcwkcjlökjö
\ No newline at end of file