From 0f8a2bceb299cebea6b01b286d65a180c4bcae3f Mon Sep 17 00:00:00 2001
From: thing 1 <thing1@seacrossedlovers.xyz>
Date: Mon, 16 Dec 2024 11:43:28 +0000
Subject: fixed merge confict hell

---
 .gitignore | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index cc65718..a083917 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,11 @@
-*.o
 *.pdf
+*-blx.bib 
+*.fls 
+*.aux 
+*.bbl 
+*.blg 
+*.fdb_latexmk 
+*.log 
+*.out 
+*.xml 
+*.toc
-- 
cgit v1.2.3