Solved a problem with a failed merge

1d9288e3 · Sergi Hernandez · b67a7488 · 1d9288e3
Commit 1d9288e3 authored 9 years ago by Sergi Hernandez
--- a/examples/movements/Makefile
+++ b/examples/movements/Makefile
@@ -2,11 +2,7 @@ PROJECT=movements
 ########################################################
 # afegir tots els fitxers que s'han de compilar aquí
 ########################################################
-<<<<<<< HEAD
 SOURCES=movements.c 
-=======
-SOURCES=movements.c
->>>>>>> bb3693e4d9ffb85e92c2e772593c847b9acd437c

 OBJS=$(SOURCES:.c=.o)
 SRC_DIR=./