Resolvinmg conflicts

This commit is contained in:
vcerenu 2025-08-07 08:47:53 -03:00
parent 24c7df995e
commit 1263e076c6
No known key found for this signature in database
GPG Key ID: 4D7B159107F1244A

View File

@ -1,9 +1,4 @@
{ {
<<<<<<< HEAD
"version": "4.13.0", "version": "4.13.0",
"stage": "rc4" "stage": "rc4"
=======
"version": "4.13.1",
"stage": "alpha0"
>>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca
} }