Merge-upstream合并lean源码错误

[tianiue]

Run git pull https://github.com/coolsnowwolf/lede.git --log --no-commit From https://github.com/coolsnowwolf/lede

• branch HEAD -> FETCH_HEAD Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result. Error: Process completed with exit code 1.