solve merge conflict

2 years ago · 7b588354dd
2 changed files with 9 additions and 0 deletions
--- a/src/CustomerProperties.h
+++ b/src/CustomerProperties.h
@ -1,9 +1,14 @@
 typedef struct Customer{
+<<<<<<< HEAD
 <<<<<<< HEAD
 	int ID;
 	char *forename,*surname,*password;
 =======
 	char *ID, *forename, *surname, *password;
 >>>>>>> 3e7a7d3 (Implementation of functions LoginAsCustomer() and Login())
+=======
+	int ID;
+	char *forename,*surname,*password;
+>>>>>>> 4d810f5640d89a86c1f2feef3ab19118518ad49f
 	float balance;
 }customer_t;
--- a/tests/build/test/cache/defines_dependency.yml
+++ b/tests/build/test/cache/defines_dependency.yml
@ -1,7 +1,11 @@
 ---
 <<<<<<< HEAD
+<<<<<<< HEAD
 "/home/julius/Documents/Studium/Informatik/1. Semester/ProgMeth/Bankmanagement/bankmanagement-system/src/StringManipulation.c":
 =======
 "/home/julius/Documents/Studium/Informatik/1. Semester/ProgMeth/Bankmanagement/bankmanagement-system/src/LoginCustomer.c":
 >>>>>>> 0155f61 (implementation of unit tests for checkLogin())
+=======
+"/home/julius/Documents/Studium/Informatik/1. Semester/ProgMeth/Bankmanagement/bankmanagement-system/src/LoginCustomer.c":
+>>>>>>> 4d810f5640d89a86c1f2feef3ab19118518ad49f
 - TEST