DZR/bettergi-scripts-list
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复冲突

Browse Source
This commit is contained in:
辉鸭蛋
2024-12-08 15:53:40 +08:00
parent a02e04dbd2
commit 40fec70d60
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
repo/js/芙芙挂机暗杀流/manifest.json
View File

@@ -1,20 +1,3 @@
<<<<<<< HEAD
{
"manifest_version": 1,
"name": "芙芙挂机暗杀流",
"version": "1.0",
"bgi_version": "0.37.2",
"description": "用于芙宁娜海鲜挂机暗杀地方传奇",
"authors": [
{
"name": "起个名字好难",
"link": "https://mualani.fun"
}
],
"settings_ui": "settings.json",
"main": "main.js"
}
=======
{ {
"manifest_version": 1, "manifest_version": 1,
"name": "芙芙挂机暗杀流", "name": "芙芙挂机暗杀流",
@@ -30,4 +13,3 @@
"settings_ui": "settings.json", "settings_ui": "settings.json",
"main": "main.js" "main": "main.js"
} }
>>>>>>> 7bd87de6de79f095e156c9c910f148dc9aa7f781