From 2be4d5e569867f0fb455f046b067b08a5611b462 Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Mon, 14 May 2018 19:13:16 +1200
Subject: [PATCH] Fix from review.

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 89b72b53c0..2de05c95d1 100644
--- a/Makefile
+++ b/Makefile
@@ -477,7 +477,11 @@ test junittest:
 
 check-target-independence:
 	$(V1) for test_target in $(VALID_TARGETS); do \
+<<<<<<< HEAD
 		FOUND=$$(grep -rP "\W$${test_target}\W?" src/main/ | grep -vP "(\/\/)|(\/\*).*\W$${test_target}\W?" | grep -vP "^src/main/target"); \
+=======
+		FOUND=$$(grep -rP "\W$${test_target}\W" src/main/ | grep -vP "(\/\/)|(\/\*).*\W$${test_target}\W" | grep -vP "^src/main/target"); \
+>>>>>>> 2a65b67d2... Fix from review.
 		if [ "$${FOUND}" != "" ]; then \
 			echo "Target dependencies found:"; \
 			echo "$${FOUND}"; \