From b25bea323a62c8a584834a4da472bc882620a1af Mon Sep 17 00:00:00 2001 From: Justin Merrell Date: Tue, 24 Jan 2023 02:00:56 -0500 Subject: [PATCH] Update CD_dev-release.yml --- .github/workflows/CD_dev-release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 68453cd..86656a8 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -83,9 +83,7 @@ jobs: git pull origin dev-release - git checkout dev-release - - git merge -X theirs origin/master-ci + git merge master-ci rm -rf LICENSE rm -rf README.md