From b869345671bd7464432fb789ae9f77d667d5135a Mon Sep 17 00:00:00 2001
From: Manuel Traut <manut@ford.mecka.net>
Date: Sat, 18 Jul 2020 09:51:23 +0200
Subject: added pruefung 2020 in minor changes

---
 confighandout.tex | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'confighandout.tex')

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
-- 
cgit v1.2.3