Fix merge conflicts, part 2

mindgraffiti · mindgraffiti · commit f0b882fa9dc6 · 2018-06-25T15:19:42.000-05:00
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift
@@ -57,9 +57,9 @@ class OrderDetailsViewController: UIViewController {
                 noteRows.append(.orderNote)
             }
         }
-        let orderNotesSection = Section(title: NSLocalizedString("ORDER NOTES", comment: "Order notes section title"), footer: nil, rows: noteRows)
+        let orderNotesSection = Section(titles: [NSLocalizedString("ORDER NOTES", comment: "Order notes section title")], footer: nil, rows: noteRows)
 
-        let paymentSection = Section(title: NSLocalizedString("PAYMENT", comment: "Payment section title"), footer: nil, rows: [.payment])
+        let paymentSection = Section(titles: [NSLocalizedString("PAYMENT", comment: "Payment section title")], footer: nil, rows: [.payment])
 
         // FIXME: this is temporary
         // the API response always sends customer note data

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,9 @@ class OrderDetailsViewController: UIViewController {`
`57`	`57`	`noteRows.append(.orderNote)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- let orderNotesSection = Section(title: NSLocalizedString("ORDER NOTES", comment: "Order notes section title"), footer: nil, rows: noteRows)`
	`60`	`+ let orderNotesSection = Section(titles: [NSLocalizedString("ORDER NOTES", comment: "Order notes section title")], footer: nil, rows: noteRows)`
`61`	`61`
`62`		`- let paymentSection = Section(title: NSLocalizedString("PAYMENT", comment: "Payment section title"), footer: nil, rows: [.payment])`
	`62`	`+ let paymentSection = Section(titles: [NSLocalizedString("PAYMENT", comment: "Payment section title")], footer: nil, rows: [.payment])`
`63`	`63`
`64`	`64`	`// FIXME: this is temporary`
`65`	`65`	`// the API response always sends customer note data`