Mercurial > lada > lada-client
changeset 444:52d9af2cf6f1
Merged
| author | Torsten Irländer <torsten.irlaender@intevation.de> |
|---|---|
| date | Tue, 03 Dec 2013 11:29:27 +0100 |
| parents | 0ab89a3b9090 (current diff) d900db3e9be9 (diff) |
| children | a122424f2f0f |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Dec 03 11:24:13 2013 +0100 +++ b/.hgtags Tue Dec 03 11:29:27 2013 +0100 @@ -16,3 +16,5 @@ f4185f2d1a7ca10b5f04c6c819f1771513b9d99b 0.9 f4185f2d1a7ca10b5f04c6c819f1771513b9d99b 0.9 759828c533f54455fd18106a67c2a46256b2dc90 0.9 +759828c533f54455fd18106a67c2a46256b2dc90 0.9 +1fc4407c6c8372cb024e673c8ece3dd508b457e3 0.9
--- a/app/model/Probe.js Tue Dec 03 11:24:13 2013 +0100 +++ b/app/model/Probe.js Tue Dec 03 11:29:27 2013 +0100 @@ -10,8 +10,6 @@ {name: "datenbasisId"}, {name: "erzeugerId"}, {name: "hauptprobenNr"}, - {name: "messmethode"}, - {name: "nebenprobenNr"}, {name: "letzteAenderung", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()}, {name: "media"}, {name: "mediaDesk"},