From 9743bc88bc173ab910b9c961cff2bf25e6dfd44a Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Tue, 25 Feb 2020 04:54:53 +0800 Subject: [PATCH] Update r1s_lienol.yml --- .github/workflows/r1s_lienol.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml index b398ca1..abd5a89 100644 --- a/.github/workflows/r1s_lienol.yml +++ b/.github/workflows/r1s_lienol.yml @@ -79,7 +79,7 @@ jobs: git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git checkout upstream/dev-19.07 -b tmp #git revert --no-edit 2202533d29c1494ad5645f87a7429e70f85a0110 - sed -i '/ucl upx/d' tools/Makefile + sed -i '/ucl upx/d' tools/Makefile && git add tools/Makefile 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