修正上次，提交了错误的版本的问题

2024-11-06 19:24:04 +08:00
parent aadd71adec
commit 8e0cfb6b24
3 changed files with 93 additions and 39 deletions
--- a/repo/js/AutoWoodmen/settings.json
+++ b/repo/js/AutoWoodmen/settings.json
@@ -19,12 +19,8 @@
        "type": "input-text",
        "label": "加载延迟"
    }
-<<<<<<< HEAD
    // { //等待作者更新多选框
    // 
-=======
-    // {
->>>>>>> 4ef6622093dc64b25aee0b3568adf04e46285fd7
    //     "name": "checkValue", // 变量名，在js内使用 settings.变量名 获取对应的配置值
    //     "type": "checkbox", // 类型
    //     "label": "全选" // 显示标签