misc: fix conflict

2022-02-28 21:45:09 +01:00
parent b261f5755d
commit f4e2b4cf74
1 changed files with 0 additions and 4 deletions
--- a/main.tex
+++ b/main.tex
@ -74,12 +74,8 @@ 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