From 4c5e15cd6d8060ff63cbfc2cb0f1d1d2d77d420f Mon Sep 17 00:00:00 2001
From: Richard Andersen <randersenyb@andersenfamily.us>
Date: Wed, 24 Jul 2024 13:57:39 -0700
Subject: [PATCH] Fix ignored

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

diff --git a/.gitignore b/.gitignore
index 5ac141559..0c5764b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,10 +17,5 @@ results/*
 venv
 
 .idea
-aerospike/data/*.hdf5
 aerospike/data/*
-<<<<<<< HEAD
-aerospike/results/*.hdf5
-=======
 aerospike/results/*
->>>>>>> 8754424984433ad748d1b1a1b864bc1bda33bed4