Compare commits

..

No commits in common. "main" and "Tik_Tak" have entirely different histories.

7 changed files with 0 additions and 20 deletions

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>PR1_Git_Uebung</name> <name>PR1_Git_Uebung</name>
@ -10,16 +9,3 @@
<natures> <natures>
</natures> </natures>
</projectDescription> </projectDescription>
=======
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>PR1_Git_Uebung</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
>>>>>>> branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git

View File

@ -1 +0,0 @@
Oliver Piorek

View File

@ -1 +0,0 @@
2211778

View File

@ -1 +0,0 @@
Efstathios Kalaitsidis 1

View File

@ -1 +0,0 @@
Jeremy Karten

View File

@ -1 +0,0 @@
din

View File

@ -1 +0,0 @@
Duncan Rapp