Update V4.5.0

TimeBreeze · Oct 2, 2024 · 6b69826 · 6b69826
2 parents 1865bb5 + bc9ad36
commit 6b69826
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/Tritium.json b/Tritium.json
@@ -1,6 +1,16 @@
 {
   "versionCode": ,
+<<<<<<< HEAD
   "version": "V4.5.0",
   "zipUrl": "https://github.moeyy.xyz/https://github.com/TimeBreeze/Tritium/releases/download/V4.5.0/Magisk_V4.5.0.zip",
+=======
+<<<<<<< HEAD
+  "version": "V4.4.2",
+  "zipUrl": "https://github.moeyy.xyz/https://github.com/TimeBreeze/Tritium/releases/download/V4.4.2/Magisk_V4.4.2.zip",
+=======
+  "version": "V4.4.2",
+  "zipUrl": "https://github.moeyy.xyz/https://github.com/TimeBreeze/Tritium/releases/download/V4.4.2/Magisk_V4.3.6.zip",
+>>>>>>> cc471f25e1f756a1e56e160c082d4e68eb8ca1d5
+>>>>>>> bc9ad36cc76c27f092c03441b349211daef04b3a
   "changelog": "https://github.moeyy.xyz/https://github.com/TimeBreeze/Tritium/blob/main/Tritium.json"
 }
diff --git a/magisk/module.prop b/magisk/module.prop
@@ -1,6 +1,14 @@
 id=ct_module
 name=Tritium Scheduler
+<<<<<<< HEAD
 version=V4.5.0
+=======
+<<<<<<< HEAD
+version=V4.4.2
+=======
+version=V4.4.2
+>>>>>>> cc471f25e1f756a1e56e160c082d4e68eb8ca1d5
+>>>>>>> bc9ad36cc76c27f092c03441b349211daef04b3a
 versionCode=
 author=Suni
 description=Power By CuprumTrubo