From 7cf25fcc5090578014a3232475e7912aaf2ce1b1 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Fri, 7 Feb 2020 08:48:24 +0800 Subject: [PATCH] Update r2s_lienol.yml --- .github/workflows/r2s_lienol.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index ab6ac5d..7f2b04d 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -49,8 +49,8 @@ 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/Lienol/openwrt && git fetch upstream - git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs - git checkout upstream/master -- feeds.conf.default + git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/my-19.07-full -X theirs + git checkout upstream/my-19.07-full -- feeds.conf.default - name: Clean Feeds run: |