From f9283ada069f731412147b90357a093eff483ce1 Mon Sep 17 00:00:00 2001
From: Martijn Laarman <Mpdreamz@gmail.com>
Date: Fri, 5 Jan 2024 22:55:40 +0100
Subject: [PATCH] fix bad merge

---
 .github/workflows/ci.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19101ee..2dc9ad1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,20 +27,12 @@ jobs:
         git tag --list
     - uses: actions/setup-dotnet@v1
       with:
-<<<<<<< Updated upstream
-          dotnet-version: '3.1.201'
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '8.0.100'
+        dotnet-version: |
+          8.0.x
+          6.0.x
         source-url: https://nuget.pkg.github.com/nullean/index.json
-=======
-          dotnet-version: |
-              8.0.x
-              6.0.x
-          source-url: https://nuget.pkg.github.com/nullean/index.json
->>>>>>> Stashed changes
       env:
-          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
         
     - run: ./build.sh build -s true
       name: Build