2022-10-12 13:17:07 +02:00
|
|
|
<<<<<<< HEAD
|
2022-10-12 13:15:56 +02:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
|
<projectDescription>
|
|
|
|
|
<name>PR1_Git_Uebung</name>
|
|
|
|
|
<comment></comment>
|
|
|
|
|
<projects>
|
|
|
|
|
</projects>
|
|
|
|
|
<buildSpec>
|
|
|
|
|
</buildSpec>
|
|
|
|
|
<natures>
|
|
|
|
|
</natures>
|
|
|
|
|
</projectDescription>
|
2022-10-12 13:17:07 +02:00
|
|
|
=======
|
2022-10-12 13:00:27 +02:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
|
<projectDescription>
|
|
|
|
|
<name>PR1_Git_Uebung</name>
|
|
|
|
|
<comment></comment>
|
|
|
|
|
<projects>
|
|
|
|
|
</projects>
|
|
|
|
|
<buildSpec>
|
|
|
|
|
</buildSpec>
|
|
|
|
|
<natures>
|
|
|
|
|
</natures>
|
|
|
|
|
</projectDescription>
|
2022-10-12 13:17:07 +02:00
|
|
|
>>>>>>> branch 'main' of https://gitty.informatik.hs-mannheim.de/2012537/PR1_Git_Uebung.git
|
