makefile syntax fix
@@ -71,7 +71,6 @@ buildPodStatusCheck:
pushPodStatusCheck:
docker push quay.io/comcast/pod-status-check:1.0.1
-<<<<<<< HEAD
buildCheckReaper:
docker build -t quay.io/comcast/check-reaper:1.0.0 -f cmd/check-reaper/Dockerfile .
