Drop the warning about the dependencies being overwritten.

The pyproject.toml file is the place where things are being migrated too so it was a bit reduntant.
2025-01-28 04:04:59 -05:00
parent 39a918f74b
commit f509d89d90
2 changed files with 6 additions and 10 deletions
--- a/src/fenrirscreenreader/fenrirVersion.py
+++ b/src/fenrirscreenreader/fenrirVersion.py
@@ -4,6 +4,11 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.

+<<<<<<< Updated upstream

 version = "2025.01.08"
 codeName = "testing"
+=======
+version = "2025.01.24"
+codeName = "stable"
+>>>>>>> Stashed changes