diff options
Diffstat (limited to 'confighandout.tex')
| -rw-r--r-- | confighandout.tex | 3 |
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 |