solve merge conflict · dc6049fa86 - 2022-2-WS_group_project_bankmanagement-system - Gitea: Git with a cup of tea

solve merge conflict

remotes/origin/feature/customer-login

fdai7057 2 years ago

parent

44921acb9f

commit

dc6049fa86

1 changed files with 7 additions and 0 deletions

Unified View

								
									7

build-project.sh

									View File
								
				@ -1,7 +1,14 @@
			
				clear
				
				clear
			
				<<<<<<< HEAD
			
				ceedling test:all
				
				ceedling test:all
			
				cd src/
				
				cd src/
			
				gcc main.c createCustomer.c -o prog
				
				gcc main.c createCustomer.c -o prog
			
				./prog
				
				./prog
			
				rm prog
				
				rm prog
			
				cd ..
				
				cd ..
			
				=======
			
				cd src/
			
				gcc main.c
			
				./a.out
			
				rm a.out
			
				>>>>>>> 38af5af (build script)