From 5d927588730522dac8fe0c31f5ae98c5222b5c1c Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Tue, 25 Feb 2020 21:26:54 +0800 Subject: [PATCH] Update r2s_lean.yml --- .github/workflows/r2s_lean.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index e1437db..8379be6 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -86,7 +86,7 @@ jobs: cd friendlywrt 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 rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs git cherry-pick origin/master-v19.07.1 aea926c37bf7fbaf6a9fd4142d29b2f9c659cc01^...origin/master-v19.07.1 git checkout upstream/master -- feeds.conf.default git apply ../../0001-fix-upx.patch