mirror of
https://github.com/fosrl/gerbil.git
synced 2026-03-04 09:46:45 +00:00
Fix merge issue
This commit is contained in:
4
Makefile
4
Makefile
@@ -21,11 +21,7 @@ test:
|
|||||||
local:
|
local:
|
||||||
CGO_ENABLED=0 GOOS=linux go build -o gerbil
|
CGO_ENABLED=0 GOOS=linux go build -o gerbil
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
go-build-release:
|
go-build-release:
|
||||||
=======
|
|
||||||
release:
|
|
||||||
>>>>>>> bab8630756f5b243feec8a9e8952086498808a11
|
|
||||||
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o bin/gerbil_linux_arm64
|
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o bin/gerbil_linux_arm64
|
||||||
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/gerbil_linux_amd64
|
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/gerbil_linux_amd64
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user