Fixed merge conflict.

setup.py

@@ -60,9 +60,6 @@ def read(fname):
 setup(
     # Application name:
     name="fenrir-screenreader",
-    # Version is now handled by setuptools_scm
-    use_scm_version=True,
-    setup_requires=['setuptools_scm'],
     # description
     description="A TTY Screen Reader for Linux.",
     long_description=read('README.md'),

src/fenrirscreenreader/fenrirVersion.py

@@ -5,4 +5,4 @@
 # By Chrys, Storm Dragon, and contributers.
 
 version = "2024.12.20"
-codeName = "testing"
+codeName = "stable"

tools/configure_fenrir.py

@@ -201,7 +201,7 @@ class FenrirConfigTool:
 
         # Test voice configuration
         if self.test_voice(moduleChoice, voice):
-            config = configparser.ConfigParser()
+            config = configparser.ConfigParser(interpolation=None)
             config.read(self.settingsFile)
             
             if 'speech' not in config:
@@ -244,7 +244,7 @@ class FenrirConfigTool:
 
     def edit_general_config(self) -> None:
         while True:
-            config = configparser.ConfigParser()
+            config = configparser.ConfigParser(interpolation=None)
             config.read(self.settingsFile)
             sections = config.sections()