From c4910d9f6d6d073f62f432a7f8c1942cd4b60112 Mon Sep 17 00:00:00 2001 From: bahill Date: Fri, 19 Jan 2024 16:09:21 -0500 Subject: [PATCH] fixed left over from merge conflict resolution --- .github/workflows/build_and_publish_main.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_and_publish_main.yaml b/.github/workflows/build_and_publish_main.yaml index d36e4d98..4d3fc3f6 100644 --- a/.github/workflows/build_and_publish_main.yaml +++ b/.github/workflows/build_and_publish_main.yaml @@ -1,7 +1,6 @@ name: Main Validation and Release Workflow on: pull_request_target: -<<<<<<< HEAD types: - closed branches: