From 024704f2bdf7409a689faf525c94a118dd6c83fb Mon Sep 17 00:00:00 2001
From: root <root@wonderland>
Date: Sat, 15 Feb 2025 22:21:23 +0100
Subject: [PATCH] fix gitignore

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b40632..457c85a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
 .git
 www/participants/*/*.csv
 scripts/__pycache__/**
-<<<<<<< HEAD
-=======
-
->>>>>>> 221e577 (updated gitignore and footer)