Forgot to save file

actionquake · Feb 6, 2024 · e5516c4 · e5516c4
1 parent ebce246
commit e5516c4
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,14 +60,8 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-<<<<<<< HEAD
-          sudo apt-get install -y gcc-mingw-w64 meson nasm uuid-dev \
-          libavcodec-dev libavformat-dev libavutil-dev \
-          libswresample-dev libswscale-dev \
-=======
           sudo apt-get install -y gcc-mingw-w64 nasm python3-pip ninja-build
           sudo python3 -m pip install meson
->>>>>>> 49b9c7ede0420f66ae941f3211875ec7d4338c8c
 
       - name: Build
         run: |