Merge branch 'wip'

2022-02-28 21:44:00 +01:00
parent 5173e64bbe c550a7ff89
commit b261f5755d
12 changed files with 574 additions and 42 deletions
--- a/main.tex
+++ b/main.tex
@ -46,6 +46,8 @@ Martijn Remmen
 %% }


+\usepackage{multirow}
+\usepackage{tikz}

 \usepackage[pdftex,
           pdfauthor={\auteur},
@ -72,7 +74,12 @@ Martijn Remmen
    \input{chapters/4 - kwaliteit.tex}
    \input{chapters/5 - organisatie.tex}
    \input{chapters/6 - projectgrenzen.tex}
+<<<<<<< HEAD
    \input{chapters/7 - planning.tex}
+=======
+    \input{chapters/7 - risicoanalyse.tex}
+    \input{chapters/8 - planning.tex}
+>>>>>>> wip
    
    \printbibliography