mirror of https://github.com/minetest/minetest.git
Fix rebase errors
This commit is contained in:
parent
1ca8a02269
commit
53233b7ab2
|
@ -40,7 +40,6 @@ build/.cmake/
|
||||||
appimage-build
|
appimage-build
|
||||||
AppDir
|
AppDir
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
## Files related to Minetest development cycle
|
## Files related to Minetest development cycle
|
||||||
/*.patch
|
/*.patch
|
||||||
*.diff
|
*.diff
|
||||||
|
|
|
@ -21,10 +21,6 @@ jobs:
|
||||||
cmake . -DUSE_SDL2=OFF
|
cmake . -DUSE_SDL2=OFF
|
||||||
make VERBOSE=1 -j2
|
make VERBOSE=1 -j2
|
||||||
|
|
||||||
- name: Test
|
|
||||||
run: |
|
|
||||||
./bin/Linux/tests
|
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: |
|
run: |
|
||||||
ctest --output-on-failure
|
ctest --output-on-failure
|
||||||
|
|
1383
src/CMakeLists.txt
1383
src/CMakeLists.txt
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue