Sat 13 Aug 2022 11:52:27 AM CEST

This commit is contained in:
Bert van der Weerd 2022-08-13 11:52:27 +02:00
parent ac2dfe37fc
commit fc671470d4
No known key found for this signature in database
GPG Key ID: 73370A0B9E5516B0
1 changed files with 1 additions and 6 deletions

View File

@ -218,7 +218,6 @@ docker-macos-aarch64 :
macos-aarch64 :
${MAKE} -f assets/macos.mk arch=aarch64 build
<<<<<<< HEAD
#
# Windows
#
@ -228,14 +227,10 @@ docker-win64 :
win64 :
${MAKE} -f assets/windows.mk build
typescript :
script -c "make clean docker-win64 win64"
=======
#
# Docker in Docker (for GitLab CI)
#
docker-dind :
docker build -f assets/dind.Dockerfile -t registry.gitlab.com/librewolf-community/browser/bsys5/dind:latest .
>>>>>>> master