2012537
/
PR1_Git_Uebung
3
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git into main

main
Olipior 2022-10-12 13:23:55 +02:00
parent a13b0d1df0 2936fe839b
commit 47131a3b81
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.project
View File

@ -1,3 +1,4 @@
<<<<<<< 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>
@ -9,3 +10,16 @@
<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
2211778.txt 100644
View File

@ -0,0 +1 @@
2211778

1
3003700.txt 100644
View File

@ -0,0 +1 @@
Jeremy Karten

1
3003836.txt 100644
View File

@ -0,0 +1 @@
din