From 6212114948ffc1673e80fb1b5382cbca0e3f03d6 Mon Sep 17 00:00:00 2001
From: Devon Bautista <devonb@lanl.gov>
Date: Thu, 26 Sep 2024 10:53:58 -0600
Subject: [PATCH] .gitignore: Delete rebase delineators

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

diff --git a/.gitignore b/.gitignore
index 6019d1b..45e95ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
 magellan
 emulator/rf-emulator
 **/*.db
-<<<<<<< HEAD
 **.tar.gz
 **.tar.zst
 **.part
-=======
 dist/*
 **coverage.out**
->>>>>>> 4b062dd (Updated .gitignore)