remove merge conflict remains from tests/Makefile

Signed-off-by: Niklas Eiling <[email protected]>
RWTH-ACS · Dec 30, 2023 · aa4bf25 · aa4bf25
1 parent f4be8a4
commit aa4bf25
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/tests/Makefile b/tests/Makefile
@@ -28,15 +28,8 @@ bin: cpu test_apps
 	mkdir -p bin
 	cp cpu/unit/*.test bin
 	cp test_apps/*.testapp bin
-<<<<<<< HEAD
 ifndef NOSAMPLES
 	cp samples/samples-bin/*.sample bin
-=======
-	cp samples/matrixMul/matrixMul bin
-	cp samples/bandwidthTest/bandwidthTest bin
-ifneq (,$(test -f "samples/nbody/nbody"))
-	cp samples/nbody/nbody bin
->>>>>>> 20e4cae (Only copy nbody if it was compiled.)
 endif
 
 clean: