Compare commits
No commits in common. "main" and "Tik_Tak" have entirely different histories.
14
.project
14
.project
|
@ -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
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Oliver Piorek
|
|
|
@ -1 +0,0 @@
|
||||||
2211778
|
|
|
@ -1 +0,0 @@
|
||||||
Jeremy Karten
|
|
|
@ -1 +0,0 @@
|
||||||
din
|
|
|
@ -1 +0,0 @@
|
||||||
Duncan Rapp
|
|
Loading…
Reference in New Issue