Update gcc-build.yml

Fix gcc-build, file didn't get staged post merge conflict.
ElunaLuaEngine · Apr 15, 2024 · 50a0dbc · 50a0dbc
1 parent 95b56de
commit 50a0dbc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/gcc-build.yml b/.github/workflows/gcc-build.yml
@@ -14,11 +14,7 @@ jobs:
     - name: Dependencies
       run: |
         sudo apt-get update && sudo apt-get install -yq libboost-all-dev g++-11
-<<<<<<< HEAD
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
-=======
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
->>>>>>> 7669887e6c552c4a9c28dd4d169b9458f409500c
     - name: Setup
       run: |
         mkdir bin