Fix merge conflict (actually fix it, i'm stupid)

gillian-guide · Jan 17, 2024 · 121b229 · 121b229
1 parent 744f6b1
commit 121b229
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/.github/workflows/msvc_x86.yml b/.github/workflows/msvc_x86.yml
@@ -32,17 +32,6 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@main
 
-<<<<<<< HEAD
-=======
-    - name: Auto Increment Version
-      uses: MCKanpolat/auto-semver-action@v2
-      id: versioning
-      with:
-        releaseType: ${{ env.VERINC }}
-        incrementPerCommit: false
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-
->>>>>>> upstream/master
     - name: Configure build
       run: ./premake5 vs2022 --with-version=vs2022