diff --git a/Ravenous.tex b/Ravenous.tex index 62a7419..30bf33e 100644 --- a/Ravenous.tex +++ b/Ravenous.tex @@ -1,6 +1,10 @@ \documentclass[11pt,a4paper,]{book} +<<<<<<< HEAD \input{Misc/Setup} +======= +\input{Misc/Setup} +>>>>>>> ab54cc4 (New definitions) \newcommand{\alternateText}{true} \begin{document}