diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index 4f29e1c..e90fc93 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -62,6 +62,7 @@ jobs: git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs + git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh git checkout upstream/master -- feeds.conf.default cd package/lean/