Commit 9b1cc494 authored by Phillip Schröder's avatar Phillip Schröder

Merge branch 'master' into 'feature_x'

# Conflicts:
#   Template/Config.tex
parents 5997c8bf 3ace032b
......@@ -2,4 +2,4 @@
%--Masterdatei: Template
\input{Config/usepackages.tex}
\input{Config/newcommands.tex}
%Schreibe etwas in Zeile 5 in einem neuen branch
\ No newline at end of file
%schreibe etwas in Zeile 5 in Branch master
\ 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