From eaa03acc6025df70416e792c33535d2840c3e2c9 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sat, 11 Apr 2020 19:53:05 +0800 Subject: [PATCH] Update r2s_lean.yml --- .github/workflows/r2s_lean.yml | 1 + 1 file changed, 1 insertion(+) 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/