Apply suggestions from code review

Signed-off-by: Kiichiro YUKAWA <[email protected]>
vdaas · Oct 4, 2024 · 3a2aa08 · 3a2aa08
1 parent 097413d
commit 3a2aa08
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Makefile.d/functions.mk b/Makefile.d/functions.mk
@@ -418,8 +418,6 @@ define update-github-actions
 	done
 endef
 
-<<<<<<< HEAD
-=======
 define gen-deadlink-checker
 	BIN_PATH="$(TEMP_DIR)/vald-deadlink-checker-gen"; \
 	rm -rf $$BIN_PATH; \
@@ -436,4 +434,3 @@ define gen-deadlink-checker
 	$$BIN_PATH -path $3 -ignore-path $4 -format $5 $1; \
 	rm -rf $$BIN_PATH
 endef
->>>>>>> da446c017 (Refactor use Absolute path for Makefile (#2670))