From c3988737c97c3267fedd88cf1695671a8c5b185d Mon Sep 17 00:00:00 2001
From: Aaron Powell <me@aaron-powell.com>
Date: Mon, 24 Mar 2025 13:26:34 +1100
Subject: [PATCH] Adding merge files to gitignore (#78)

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

diff --git a/.gitignore b/.gitignore
index 0412cb1..1dc1beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,5 @@ $RECYCLE.BIN/
 _NCrunch_*
 .*crunch*.local.xml
 nCrunchTemp_*
+
+*.orig