misc: fix conflict
This commit is contained in:
4
main.tex
4
main.tex
@ -74,12 +74,8 @@ Martijn Remmen
|
|||||||
\input{chapters/4 - kwaliteit.tex}
|
\input{chapters/4 - kwaliteit.tex}
|
||||||
\input{chapters/5 - organisatie.tex}
|
\input{chapters/5 - organisatie.tex}
|
||||||
\input{chapters/6 - projectgrenzen.tex}
|
\input{chapters/6 - projectgrenzen.tex}
|
||||||
<<<<<<< HEAD
|
|
||||||
\input{chapters/7 - planning.tex}
|
|
||||||
=======
|
|
||||||
\input{chapters/7 - risicoanalyse.tex}
|
\input{chapters/7 - risicoanalyse.tex}
|
||||||
\input{chapters/8 - planning.tex}
|
\input{chapters/8 - planning.tex}
|
||||||
>>>>>>> wip
|
|
||||||
|
|
||||||
\printbibliography
|
\printbibliography
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user