Eliminated merge conflict generated text

Michael-Herzog · Michael-Herzog · commit fe72ee42b569 · 2016-02-29T19:06:21.000+01:00
diff --git a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs
@@ -554,16 +554,11 @@ public virtual PlaceOrderResult PlaceOrder(
                 IList<OrganizedShoppingCartItem> cart = null;
                 if (!processPaymentRequest.IsRecurringPayment)
                 {
-<<<<<<< HEAD
-                    // load shopping cart
-					cart = customer.GetCartItems(ShoppingCartType.ShoppingCart, processPaymentRequest.StoreId);
-=======
                     //load shopping cart
                     if (processPaymentRequest.ShoppingCartItems.Count > 0)
                         cart = processPaymentRequest.ShoppingCartItems;
                     else
                         cart = customer.GetCartItems(ShoppingCartType.ShoppingCart, processPaymentRequest.StoreId);
->>>>>>> Minor enhancement
 
                     if (cart.Count == 0)
                         throw new SmartException(T("ShoppingCart.CartIsEmpty"));
@@ -1365,13 +1360,8 @@ public virtual PlaceOrderResult PlaceOrder(
                         // check order status
                         CheckOrderStatus(order);
 
-<<<<<<< HEAD
-						// reset checkout data
-						if (!processPaymentRequest.IsRecurringPayment)
-=======
 						//reset checkout data
                         if (!processPaymentRequest.IsRecurringPayment && !processPaymentRequest.IsMultiOrder)
->>>>>>> Minor enhancement
 						{
 							_customerService.ResetCheckoutData(customer, processPaymentRequest.StoreId, clearCouponCodes: true, clearCheckoutAttributes: true);
 						}
