chore: fix merge conflicts

PrismLibrary · Jul 22, 2024 · ba92195 · ba92195
1 parent c652b48
commit ba92195
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -161,7 +161,6 @@ jobs:
     uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
     needs: generate-consolidated-artifacts
     if: ${{ github.event_name == 'push' }}
-    environment: NuGet
     with:
       name: Deploy Commercial Plus
     secrets:

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -12,20 +12,7 @@ jobs:
       apiKey: ${{ secrets.IN_HOUSE_API_KEY }}
 
   publish-commercial-plus:
-<<<<<<< HEAD
     uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
     secrets:
       feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
       apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}
-=======
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
-    environment: NuGet
-    secrets:
-      feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
-      apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}
-
-  publish-nuget:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
-    secrets:
-      apiKey: ${{ secrets.NUGET_API_KEY }}
->>>>>>> 919a2209 (ci: remove SponsorConnect)