From f4e2b4cf74c0db9988e511fb99426c1b21084a0d Mon Sep 17 00:00:00 2001
From: martijn <martijnremmen@hotmail.nl>
Date: Mon, 28 Feb 2022 21:45:09 +0100
Subject: [PATCH] misc: fix conflict

---
 main.tex | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/main.tex b/main.tex
index 9f78513..e0b2a92 100644
--- 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