更新 Create Release.yml 中的 updateJson 链接，修复 service.sh 中的合并冲突

YumeYuka · Jan 21, 2025 · d3230fa · d3230fa
1 parent fcf9e23
commit d3230fa
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/.github/workflows/Create Release.yml b/.github/workflows/Create Release.yml
@@ -43,7 +43,7 @@ jobs:
           versionCode='"${VERSIONCODE}"'
           author=YumeYuka@Github.com
           description=智能分类文件，支持自定义配置.
-          updateJson=https://github.moeyy.xyz/https://github.com/YumeYuka/intelligent/blob/main/intelligent.json
+          updateJson=https://raw.githubusercontent.com/YumeYuka/intelligent/refs/heads/master/intelligent.json
           ' > ./magisk/module.prop
       
       - name: Zip Module

diff --git a/magisk/hashList.dat b/magisk/hashList.dat
diff --git a/magisk/service.sh b/magisk/service.sh
@@ -1,6 +1,5 @@
 # code by @YumeYuka
 
-<<<<<<< HEAD
 baseDir="$(dirname "$(readlink -f "$0")")"
 [ -f "$baseDir/skt-utils.sh" ] && . "$baseDir/skt-utils.sh" || exit
 
@@ -19,8 +18,3 @@ until_unlock
 # code after unlocked
 
 
-=======
-sleep 120
-chmod 777 ./Intelligent
-nohup ./Intelligent > /dev/null 2>&1 &
->>>>>>> 86e93bc7eca70b099cee85b567ede057345933e9