summaryrefslogtreecommitdiff
path: root/confighandout.tex
diff options
context:
space:
mode:
authorManuel Traut <manut@ford.mecka.net>2020-07-18 09:51:23 +0200
committerManuel Traut <manut@ford.mecka.net>2020-07-18 16:25:01 +0200
commitb869345671bd7464432fb789ae9f77d667d5135a (patch)
tree7c599abe9306e19ad60f3a70d63de4d599649256 /confighandout.tex
parent900c12d856bffc4769384f2fea0d33183a84917e (diff)
added pruefung 2020 in minor changesvorlesung
Diffstat (limited to 'confighandout.tex')
-rw-r--r--confighandout.tex3
1 files changed, 3 insertions, 0 deletions
diff --git a/confighandout.tex b/confighandout.tex
index bb5b65e..5a6eed8 100644
--- a/confighandout.tex
+++ b/confighandout.tex
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
\documentclass{lxarticle}
\usepackage{german}
\usepackage{polyglossia}
@@ -11,3 +12,5 @@
\setcounter{secnumdepth}{-1}
\input{section}
+=======
+>>>>>>> Stashed changes