From 561476d3abf602dec9dbbeaad17ba7d01bb3369c Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 20 Jul 2024 14:08:52 -0600
Subject: [PATCH] ci: remove public push

(cherry picked from commit 1891bfaf1a4cc41d6d152c5f316a51e21fd9ca1b)

# Conflicts:
#	.github/workflows/publish-release.yml
---
 .github/workflows/publish-release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 853a9edfa..c884f30b5 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -20,6 +20,7 @@ jobs:
     secrets:
       feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
       apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}
+<<<<<<< HEAD
 
   publish-nuget:
     uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
@@ -31,3 +32,5 @@ jobs:
     secrets:
       feedUrl: ${{ secrets.SPONSOR_CONNECT_NUGET_FEED }}
       apiKey: ${{ secrets.SPONSOR_CONNECT_TOKEN }}
+=======
+>>>>>>> 1891bfaf (ci: remove public push)