From 47d3762ee2a5329dce24eaf1d29d26cd6a153804 Mon Sep 17 00:00:00 2001
From: Tig <tig@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:31:59 -0600
Subject: [PATCH] Fixed .gitignore

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

diff --git a/.gitignore b/.gitignore
index bbfa8e16e..cca1f4801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,9 +50,9 @@ UnitTests/TestResults
 TestResults
 
 # git merge files
-.orig
-.theirs
-.ours
+*.orig
+*.theirs
+*.ours
 
 demo.*