diff --git a/latex/main.tex b/latex/main.tex index e051836..a511552 100644 --- a/latex/main.tex +++ b/latex/main.tex @@ -19,17 +19,6 @@ % \input{preamble/fonts} \input{preamble/macros} -\addbibresource{bibliography.bib} - -<<<<<<< HEAD -% \makeglossaries -======= -\makeglossaries ->>>>>>> d743ba4 (feat(latex): add glossary, acronyms, and notations) -\input{frontmatter/acronym} -\input{frontmatter/glossaries} -\input{frontmatter/notations} - \begin{document} % \input{frontmatter/maketitle} % \input{frontmatter/maketitle_secondary}