From c1ce3bf9b6c1712da23f08f4194e927c4b241d8c Mon Sep 17 00:00:00 2001
From: MaxRobinsonTheGreat <maxdrob1@gmail.com>
Date: Tue, 11 Mar 2025 10:45:25 -0500
Subject: [PATCH] fix merge conflict

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

diff --git a/.gitignore b/.gitignore
index a1b615b..71b1187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,10 +19,5 @@ experiments/
 andy_*.json
 jill_*.json
 src/models/logs/*
-<<<<<<< HEAD
-server_data/*
-server_data_*/*
-=======
 server_data*
 results/*
->>>>>>> d70491e5974a973b96c47f0515c2722b82c9b253