From 81f821b9c6b255f425af107f3111a815ac4cb30b Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Fri, 10 Apr 2020 19:40:45 +0800 Subject: [PATCH] Update r2s_lienol_from_lean.yml --- .github/workflows/r2s_lienol_from_lean.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r2s_lienol_from_lean.yml b/.github/workflows/r2s_lienol_from_lean.yml index 4d4df8b..af40408 100644 --- a/.github/workflows/r2s_lienol_from_lean.yml +++ b/.github/workflows/r2s_lienol_from_lean.yml @@ -129,7 +129,7 @@ jobs: git mv README.md README && git commit -m 'undo rename readme for rebasing' git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs - #git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d + git revert --no-edit 7d597c53471f1328b3b16cf51856c1cca8c52c93 sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh git checkout upstream/dev-lean-lede -- feeds.conf.default cd package/lean/