From f010b6235cddb122d3c76b27b18c98e9e4c738ed Mon Sep 17 00:00:00 2001 From: Justin Merrell Date: Tue, 24 Jan 2023 01:46:08 -0500 Subject: [PATCH] Update CD_dev-release.yml --- .github/workflows/CD_dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 7f21b14..ce26e0b 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -92,7 +92,7 @@ jobs: git checkout dev-release - git merge -X theirs master-ci --a + git merge -X theirs master-ci rm -rf LICENSE rm -rf README.md