From 92ce4aaf3368016363806d7df463dc1feb74d591 Mon Sep 17 00:00:00 2001 From: Justin Merrell Date: Tue, 24 Jan 2023 01:40:16 -0500 Subject: [PATCH] Update CD_dev-release.yml --- .github/workflows/CD_dev-release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index d37e76e..69ccd4e 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -86,7 +86,9 @@ jobs: git pull origin dev-release --rebase --autostash - git merge -X theirs origin/master-ci + git rm installer.sh + + git merge -X theirs origin/master-ci --a rm -rf LICENSE rm -rf README.md