diff options
| author | Sebastian Reichel <sre@ring0.de> | 2013-03-26 16:14:34 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2013-03-26 16:14:34 +0100 |
| commit | c7330792abfd7265faf4047039dd9bf5a24e5633 (patch) | |
| tree | a45b7ddc9e512172291928515dd327f3f382ecff /src/database/database.vala | |
| parent | 7bfb48ef84384ff0460f273ea5841fba628d2a46 (diff) | |
| parent | 88899c833223608e51102d7c7a61afdf62b12d4c (diff) | |
| download | serial-barcode-scanner-c7330792abfd7265faf4047039dd9bf5a24e5633.tar.bz2 | |
fix merge conflict
Diffstat (limited to 'src/database/database.vala')
| -rw-r--r-- | src/database/database.vala | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/database/database.vala b/src/database/database.vala index 640e175..f84d2c5 100644 --- a/src/database/database.vala +++ b/src/database/database.vala @@ -265,16 +265,10 @@ public class DataBase : Object { statements["stock_status"].column_text(0), statements["stock_status"].column_text(1), statements["stock_status"].column_int(2), - null, - null + statements["stock_status"].column_int(3), + statements["stock_status"].column_int(4) }; - Price mprice = statements["stock_status"].column_int(3); - Price gprice = statements["stock_status"].column_int(4); - - entry.memberprice = @"$mprice"; - entry.guestprice = @"$gprice"; - result += entry; } |