From 56ccb43c2be9450f1a06129e762a2d5dc18e3e4a Mon Sep 17 00:00:00 2001
From: Jim Shield <gothicjim@gmail.com>
Date: Thu, 18 Jan 2024 17:44:25 +0000
Subject: [PATCH] Resolve merge conflict

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 7f20734..7dea76e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.1
\ No newline at end of file
+1.0.1