Commit 6af55846 authored by Svetomir Smiljkovic's avatar Svetomir Smiljkovic

Transfer upstream repo

parent a593c574
...@@ -3,11 +3,7 @@ COMMIT ?= "" ...@@ -3,11 +3,7 @@ COMMIT ?= ""
GO ?= go GO ?= go
GOLANGCI_LINT ?= golangci-lint GOLANGCI_LINT ?= golangci-lint
<<<<<<< HEAD
LDFLAGS ?= -s -w -X github.com/janos/bee.commit="$(COMMIT)"
=======
LDFLAGS ?= -s -w -X github.com/ethersphere/bee.commit="$(COMMIT)" LDFLAGS ?= -s -w -X github.com/ethersphere/bee.commit="$(COMMIT)"
>>>>>>> 1971bae2015d482f60af4e87b73d1999abc90157
.PHONY: all .PHONY: all
all: build lint vet test binary all: build lint vet test binary
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment