solve merge conflict

2 years ago · dc6049fa86
1 changed files with 7 additions and 0 deletions
--- a/build-project.sh
+++ b/build-project.sh
@ -1,7 +1,14 @@
 clear
+<<<<<<< HEAD
 ceedling test:all
 cd src/
 gcc main.c createCustomer.c -o prog
 ./prog
 rm prog
 cd ..
+=======
+cd src/
+gcc main.c
+./a.out
+rm a.out
+>>>>>>> 38af5af (build script)