Fixed missing resolve.

27a17e3d · Tobias Dussa · 1511a747 · 27a17e3d · 27a17e3d · 27a17e3d
Commit 27a17e3d authored Dec 11, 2017 by Tobias Dussa
--- a/Formulare/kit-antrag.sty
+++ b/Formulare/kit-antrag.sty
@@ -327,11 +327,7 @@ Monaten im Original bei der KIT-CA einreichen (siehe
 \vspace{3mm}

 \begin{tabbing}
-<<<<<<< HEAD
 \xmark[\Huge]\linie{0.45\linewidth}\hspace{0.1\linewidth}\=\xmark[\Huge]\linie*{0.45\linewidth}\\
-=======
-\linie{0.45\linewidth}\hspace{0.1\linewidth}\=\linie*{0.45\linewidth}\\
->>>>>>> b7899c371f95d45cc2371673a1925928072cc778
 (Ort, Datum, gegebenenfalls Institutsstempel)\>(Unterschrift -- wie im Ausweis)
 \end{tabbing}


--- a/Formulare/written_statement.pdf
+++ b/Formulare/written_statement.pdf
--- a/Formulare/written_statement_group.pdf
+++ b/Formulare/written_statement_group.pdf
--- a/Formulare/written_statement_pseudonym.pdf
+++ b/Formulare/written_statement_pseudonym.pdf
--- a/Formulare/written_statement_server.pdf
+++ b/Formulare/written_statement_server.pdf