fix merge conflict

2 files changed, 4 insertions, 10 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;
 		}
 
diff --git a/src/database/db-interface.vala b/src/database/db-interface.vala
index da95eb7..be9ffba 100644
--- a/src/database/db-interface.vala
+++ b/src/database/db-interface.vala
@@ -53,8 +53,8 @@ public struct StockEntry {
 	public string id;
 	public string name;
 	public int amount;
-	public string memberprice;
-	public string guestprice;
+	public Price memberprice;
+	public Price guestprice;
 }
 
 public struct PriceEntry {