From ac2988c8aa465bcf223f7d7b551a6f16bd9ca176 Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Thu, 13 Aug 2020 09:42:19 +1000
Subject: [PATCH] fix conflict

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index d715300523..de04c8c2d9 100644
--- a/Makefile
+++ b/Makefile
@@ -576,10 +576,6 @@ endif
 .PHONY: push-kic-base-image-gcr
 push-kic-base-image-gcr: kic-base-image ## Push kic-base to gcr
 	docker login gcr.io/k8s-minikube
-	(docker pull $(IMAGE) && (echo "Image already exist"; exit 1) || echo "Image doesn't exist in registry")
-ifndef AUTOPUSH
-	$(call user_confirm, 'Are you sure you want to push $(IMAGE) ?')
-endif
 	$(MAKE) push-docker IMAGE=$(KIC_BASE_IMAGE_GCR)
 
 .PHONY: push-kic-base-image-gh