From 543efe913437c83d2cbd28458c313a96a6707565 Mon Sep 17 00:00:00 2001
From: David Allen <allend@lanl.gov>
Date: Thu, 12 Sep 2024 12:14:37 -0600
Subject: [PATCH] Updated .gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

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