PPM2: select

2016-12-12 22:21:01 +01:00
parent 1b35f02647 b2f022ec66
commit 552b7cc942
10 changed files with 340 additions and 5 deletions
--- a/Praktikum2/ppm2/data/Angebote/27.json
+++ b/Praktikum2/ppm2/data/Angebote/27.json
@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "ZeitraumBis": "02.02.2003",
   "Firma": "Apple",
   "ZeitraumVon": "02.02.2002",
@ -10,4 +11,17 @@
   "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
 }