Commit 1511a747 authored by Tobias Dussa's avatar Tobias Dussa
Browse files

Merge branch 'master' of git.scc.kit.edu:KIT-CA/Interfaces

Conflicts:
	Formulare/kit-antrag.sty
	Formulare/written_statement.pdf
	Formulare/written_statement_group.pdf
	Formulare/written_statement_pseudonym.pdf
	Formulare/written_statement_pseudonym.tex
	Formulare/written_statement_server.pdf
parents 044aea3d b7899c37
......@@ -327,7 +327,11 @@ 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}
......
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