resolve conflicts

mine
derailed 2020-03-06 10:05:42 -07:00
commit bd70982b50
1 changed files with 2 additions and 1 deletions

View File

@ -1,7 +1,8 @@
NAME := k9s NAME := k9s
PACKAGE := github.com/derailed/$(NAME) PACKAGE := github.com/derailed/$(NAME)
GIT := $(shell git rev-parse --short HEAD) GIT := $(shell git rev-parse --short HEAD)
DATE := $(shell date +%FT%T%Z) SOURCE_DATE_EPOCH ?= $(shell date +%s)
DATE := $(shell date -u -d @${SOURCE_DATE_EPOCH} +%FT%T%Z)
VERSION ?= v0.17.5 VERSION ?= v0.17.5
IMG_NAME := derailed/k9s IMG_NAME := derailed/k9s
IMAGE := ${IMG_NAME}:${VERSION} IMAGE := ${IMG_NAME}:${VERSION}