commit 0f8a2bceb299cebea6b01b286d65a180c4bcae3f parent 1151d348c0d8d5e3a92d02188911dfd305c9187b Author: thing 1 <thing1@seacrossedlovers.xyz> Date: Mon, 16 Dec 2024 11:43:28 +0000 fixed merge confict hell Diffstat:
| M | .gitignore | | | 11 | ++++++++++- |
| M | comp/lucas-standen-NEA/writeup2/writeup.tex | | | 2 | +- |
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -1,2 +1,11 @@ -*.o *.pdf +*-blx.bib +*.fls +*.aux +*.bbl +*.blg +*.fdb_latexmk +*.log +*.out +*.xml +*.toc diff --git a/comp/lucas-standen-NEA/writeup2/writeup.tex b/comp/lucas-standen-NEA/writeup2/writeup.tex @@ -82,7 +82,7 @@ This is the second version of this document, it was written in GNU roff before, however I decided to move over to {\LaTeX} for the more modern features (notably image support). The {\LaTeX} source for this document is also available along with all referenced code at -\url{https://github.com/standenboy/school} +\url{https://git.seacrossedlovers.xyz/school}. \section{Analysis} \subsection{The current problem}