resolve conflicts

2018-11-17 11:55:26 -03:00
parent a91f3e2b59 bc9a6573da
commit e41b6e9b1b
9 changed files with 301 additions and 38 deletions
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,7 +2,8 @@ CC=gcc
 CFLAGS=-Wall -I../src/include -DDEBUG -g
 SRC=test.c
 OBJ=$(SRC:.c=.o)
-OBJ+=../src/random.o ../src/bubble_sort.o ../src/timer.o ../src/count_sort.o ../src/quick_sort.o ../src/bitonic_sort.o ../src/selection_sort.o
+
+OBJ+=../src/random.o ../src/bubble_sort.o ../src/timer.o ../src/count_sort.o ../src/quick_sort.o ../src/merge_sort.o ../src/bitonic_sort.o ../src/selection_sort.o

 all: test