Cleaning up bad merge

slackhq · Sep 13, 2023 · e84e50a · e84e50a
1 parent 167fd5d
commit e84e50a
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -90,11 +90,6 @@ endif
 	if [ ! -x "${HOME}/go/bin/${GOOS}_${GOARCH}/vttablet" ]; then \
 		echo "Missing vttablet at: ${HOME}/go/bin/${GOOS}_${GOARCH}/vttablet" && exit; \
 	fi
-<<<<<<< HEAD
-=======
-
-	# Cross-compiling w/ cgo isn't trivial and we don't need vtorc, so we can skip building it
->>>>>>> 356828b1f1 (Upgrade go slack vitess r14.0.5 (#91))
 
 debug:
 ifndef NOBANNER