Fixed merge conflict.

Merge branch 'testing' got rid of the scm dependency."
Change codename to stable for tag.
2024-12-21 17:52:38 -05:00 · 2024-12-20 14:11:51 -05:00 · 2024-12-20 13:33:23 -05:00 · 2024-12-20 12:50:32 -05:00
1 changed files with 2 additions and 2 deletions
--- a/src/fenrirscreenreader/fenrirVersion.py
+++ b/src/fenrirscreenreader/fenrirVersion.py
@ -4,5 +4,5 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.

-version = "2024.12.21"
-codeName = "testing"
+version = "2024.12.20"
+codeName = "stable"
Author	SHA1	Message	Date
Storm Dragon	9da925c80d	Fixed merge conflict.	2024-12-21 17:52:38 -05:00
Storm Dragon	d1be848ebb	Merge branch 'testing' got rid of the scm dependency."	2024-12-20 14:11:51 -05:00
Storm Dragon	6f8139ed8f	Change codename to stable for tag.	2024-12-20 13:33:23 -05:00
Storm Dragon	f1a6c75459	Merged setup fixes to master. Went back to setup.py just with some updates to minimize python's grumbling. Also, merged the locale setup.	2024-12-20 12:50:32 -05:00