From 2cc2fda28c41cee5f9c0c869e51142f104111c85 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 2 Mar 2025 17:59:20 -0500
Subject: [PATCH] Actually fix the version file this time.

---
 src/fenrirscreenreader/fenrirVersion.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/fenrirscreenreader/fenrirVersion.py b/src/fenrirscreenreader/fenrirVersion.py
index e969eab0..7bd17da9 100644
--- a/src/fenrirscreenreader/fenrirVersion.py
+++ b/src/fenrirscreenreader/fenrirVersion.py
@@ -4,10 +4,5 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-<<<<<<< HEAD
 version = "2025.03.02"
 codeName = "master"
-=======
-version = "2025.03.02"
-codeName = "testing"
->>>>>>> testing