Revert "PPM2: select"

This reverts commit 552b7cc942
2016-12-12 23:04:04 +01:00
parent 552b7cc942
commit 8060d7af68
10 changed files with 5 additions and 340 deletions
--- a/Praktikum2/ppm2/data/Angebote/27.json
+++ b/Praktikum2/ppm2/data/Angebote/27.json
@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "ZeitraumBis": "02.02.2003",
   "Firma": "Apple",
   "ZeitraumVon": "02.02.2002",
@ -11,17 +10,4 @@
   "Firmenbetreuer": "Horst",
   "Voraussetzungen": "Keine",
   "Name": "Angebot Apple 2"
-=======
-   "Lehrender": "5",
-   "Status": "abgeschlossen",
-   "Firmenbetreuer": "Horst",
-   "Firma": "Apple",
-   "Name": "Angebot Apple 2",
-   "Beschreibung": "Praxisphase Apple",
-   "Student": "11",
-   "Voraussetzungen": "Keine",
-   "ZeitraumBis": "02.02.2003",
-   "id": "27",
-   "ZeitraumVon": "02.02.2002"
->>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
 }