Front integration

Created by: SimonGuilloud

Reference Manual/lisa.tex

@@ -56,11 +56,8 @@ escapeinside={(*@}{@*)}
 \begin{document}
 \maketitle
 \chapter*{Introduction}
-<<<<<<< HEAD
-This document aims to give a complete documentation on LISA. Tentatively, every chapter and section will explain a part or concept of LISA, and explains both its implementation and its theoretical foundations.
-=======
+
 This document aims to give a complete documentation on LISA. Tentatively, every chapter and section will explain a part or concept of LISA, and explains both its implementation and its theoretical foundations \cite{DBLP:conf/tacas/GuilloudK22}.
->>>>>>> main
 
 \input{part1.tex}