Fix merge conflicts

Author: mindgraffiti

WooCommerce/Classes/ViewModels/OrderDetailsViewModel.swift

@@ -5,8 +5,6 @@ class OrderDetailsViewModel {
     private let order: Order
     private let couponLines: [CouponLine]?
 
-    let items: [OrderItem]
-    let fulfillTitle: String
     init(order: Order) {
         self.order = order
         self.couponLines = order.couponLines
@@ -20,6 +18,12 @@ class OrderDetailsViewModel {
         return String.localizedStringWithFormat(NSLocalizedString("Created %@", comment: "Order created date"), order.dateCreatedString) //FIXME: use a formatted date instead of raw timestamp
     }
 
+    var items: [OrderItem] {
+        return order.items
+    }
+
+    let fulfillTitle = NSLocalizedString("Fulfill order", comment: "Fulfill order button title")
+
     var paymentStatus: String {
         return order.status.description
     }
@@ -105,7 +109,5 @@ class OrderDetailsViewModel {
         }
 
         return NSLocalizedString("Discount", comment: "Discount label for payment view") + " (" + output + ")"
-        items = order.items
-        fulfillTitle = NSLocalizedString("Fulfill order", comment: "Fulfill order button title")
     }
 }

WooCommerce/Classes/ViewRelated/Orders/OrderDetails/ProductListTableViewCell.swift

@@ -35,7 +35,8 @@ extension ProductListTableViewCell {
         }
         for item in viewModel.items {
             let itemView = TwoColumnLabelView.makeFromNib()
-            itemView.configure(leftText: item.name, rightText: item.quantity.description)
+            itemView.leftText = item.name
+            itemView.rightText = item.quantity.description
             verticalStackView.addArrangedSubview(itemView)
         }
         let spacerView = IntrinsicHeightView()