fix bad merge

nullean · Jan 5, 2024 · f9283ad · f9283ad
1 parent 88bc921
commit f9283ad
Showing 1 changed file with 4 additions and 12 deletions.
diff --git 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