From 34dd8f670364baf25a0a9c6443f948fab30f47af Mon Sep 17 00:00:00 2001
From: cnisidis <makeithappen@nisidis.com>
Date: Sat, 30 Nov 2024 19:33:33 +0200
Subject: [PATCH] fixes yaml

---
 .github/workflows/main.yml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e5e3e8..3e72613 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,36 +1,25 @@
-<<<<<<< HEAD
-# For more information see:
-# https://thegraybook.vvvv.org/reference/extending/publishing.html
 
-=======
->>>>>>> 83f3ff5f0a297dbcbcdaec46e73eaae119a0e813
 name: push_nuget
 
 # on push on main
 on:
   push:
     branches:
-<<<<<<< HEAD
       - main
     paths-ignore:
       - README.md
       - .github/FUNDING.yml
-=======
       - deploy
     paths-ignore:
       - README.md
->>>>>>> 83f3ff5f0a297dbcbcdaec46e73eaae119a0e813
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
     - name: Git Checkout
-<<<<<<< HEAD
       uses: actions/checkout@master
-=======
       uses: actions/checkout@deploy
->>>>>>> 83f3ff5f0a297dbcbcdaec46e73eaae119a0e813
     
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v2
@@ -41,7 +30,7 @@ jobs:
     - name: Publish VL Nuget
       uses: vvvv/PublishVLNuget@1.0.43
       with:
-<<<<<<< HEAD
+
         csproj: src\VL.SuperCollider.csproj
         nuspec: deployment\VL.SuperCollider.nuspec
 
@@ -51,10 +40,10 @@ jobs:
         
         # Provide the nuget key. See: https://thegraybook.vvvv.org/reference/extending/publishing.html#getting-a-nugetorg-api-key
         nuget-key: ${{ secrets.NUGET_KEY }}
-=======
+
         csproj: csharp\SCSynth\SCSynth.csproj
         nuspec: deployment\VL.SCSynth.nuspec
         icon-dst: ./nugeticon.png
         nuget-key: ${{ secrets.NUGET_KEY }}
 
->>>>>>> 83f3ff5f0a297dbcbcdaec46e73eaae119a0e813
+