echoiron/echo-scoop

大佬，上次push好像没解决冲突

Dagwbl opened this issue · 2 comments

Dagwbl commented

好多json都存在冲突搜索报错了

{
<<<<<<< HEAD
    "version": "6.5.3.0",
=======
    "version": "6.5.6.0",
>>>>>>> e3244cabc7516cc5fbdc99a91beae53b2bc2be55
    "description": "修图修视频的宝藏神器",
    "homepage": "https://mt.meipai.com/pc",
    "license": "BSD-3-Clause",
    "url": "https://storage.live.com/items/F66E0B358F887479!3232:/xiuxiu.7z?authkey=AAUUvbB4eE2qHsY#/dl.7z",
    "bin": "XiuXiu.exe",
    "shortcuts": [
        [
            "XiuXiu.exe",
            "美图秀秀"
        ]
    ]
}
Dagwbl commented

呜呜，好像不是，只有我本地的json是有冲突的，你github上的没有

echoiron commented

呜呜，好像不是，只有我本地的json是有冲突的，你github上的没有

scoop bucket rm echo
scoop bucket add echo https://github.com/echoiron/echo-scoop