From 202f3a5081e4a2faf5a9416f921ea0455ab87b5b Mon Sep 17 00:00:00 2001
From: Max West <maxwest@uw.edu>
Date: Tue, 16 Apr 2024 13:32:27 -0700
Subject: [PATCH] remove merge comments from gitignore

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

diff --git a/.gitignore b/.gitignore
index e6cce4e..50990fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,9 +140,6 @@ dask-worker-space/
 tmp/
 
 # Mac OS
-<<<<<<< before updating
-.DS_Store
-=======
 .DS_Store
 
 # Airspeed Velocity performance results
@@ -151,4 +148,3 @@ _html/
 
 # Project initialization script
 .initialize_new_project.sh
->>>>>>> after updating