diff --git a/.project b/.project index cf70e27..3534a1a 100644 --- a/.project +++ b/.project @@ -1,3 +1,4 @@ +<<<<<<< HEAD PR1_Git_Uebung @@ -9,3 +10,16 @@ +======= + + + PR1_Git_Uebung + + + + + + + + +>>>>>>> branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git diff --git a/3002861.txt b/3002861.txt new file mode 100644 index 0000000..3635cc2 --- /dev/null +++ b/3002861.txt @@ -0,0 +1 @@ +Lorenzo Corso \ No newline at end of file diff --git a/3003701.txt b/3003701.txt new file mode 100644 index 0000000..224ad5f --- /dev/null +++ b/3003701.txt @@ -0,0 +1 @@ +Argtim Zabrdja \ No newline at end of file diff --git a/3004061.txt b/3004061.txt new file mode 100644 index 0000000..8d0dbe7 --- /dev/null +++ b/3004061.txt @@ -0,0 +1 @@ +Duncan Rapp \ No newline at end of file diff --git a/3004570.txt b/3004570.txt new file mode 100644 index 0000000..bf683bd --- /dev/null +++ b/3004570.txt @@ -0,0 +1 @@ +Kaan Kanat \ No newline at end of file diff --git a/3005252 b/3005252 new file mode 100644 index 0000000..63072f4 --- /dev/null +++ b/3005252 @@ -0,0 +1 @@ +Ibrahim Jabban \ No newline at end of file