From dd31e6e9474c25dd424d20d3fd97fa9ca512e009 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 7 May 2019 16:20:03 +0530 Subject: [PATCH] Remove duplicate entries from Makefile and resolve merge conflict. Signed-off-by: Humble Chirammal --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 28e351256..e9b5ee223 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,6 @@ CEPHFS_IMAGE_VERSION=$(if $(ENV_CEPHFS_IMAGE_VERSION),$(ENV_CEPHFS_IMAGE_VERSION CSI_IMAGE_NAME?=quay.io/cephcsi/cephcsi CSI_IMAGE_VERSION?=v1.0.0 -CSI_IMAGE_NAME?=quay.io/cephcsi/cephcsi -CSI_IMAGE_VERSION?=v1.0.0 - $(info rbd image settings: $(RBD_IMAGE_NAME) version $(RBD_IMAGE_VERSION)) $(info cephfs image settings: $(CEPHFS_IMAGE_NAME) version $(CEPHFS_IMAGE_VERSION))