Fix rebase errors

2024-04-18 11:57:13 -05:00 · 2024-04-18 11:57:13 -05:00 · 53233b7ab2
parent 1ca8a02269
commit 53233b7ab2
3 changed files with 928 additions and 564 deletions
--- a/.gitignore
+++ b/.gitignore
@ -40,7 +40,6 @@ build/.cmake/
 appimage-build
 AppDir

-<<<<<<< HEAD
 ## Files related to Minetest development cycle
 /*.patch
 *.diff
--- a/irr/.github/workflows/build.yml
+++ b/irr/.github/workflows/build.yml
@ -20,10 +20,6 @@ jobs:
        run: |
          cmake . -DUSE_SDL2=OFF
          make VERBOSE=1 -j2
-    
-      - name: Test
-        run: |
-          ./bin/Linux/tests

      - name: Test
        run: |
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt