MAGETWO-55695: Remove saving order from Creditmemo repository save

NadiyaS · NadiyaS · commit 89f3e85671e1 · 2016-08-05T11:05:28.000+03:00
- fix conflict after merge
diff --git a/app/code/Magento/Sales/Model/Order/PaymentAdapter.php b/app/code/Magento/Sales/Model/Order/PaymentAdapter.php
@@ -32,6 +32,7 @@ public function __construct(
         \Magento\Sales\Model\Order\Invoice\PayOperation $payOperation
     ) {
         $this->refundOperation = $refundOperation;
+        $this->payOperation = $payOperation;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public function __construct(`
`32`	`32`	`\Magento\Sales\Model\Order\Invoice\PayOperation $payOperation`
`33`	`33`	`) {`
`34`	`34`	`$this->refundOperation = $refundOperation;`
	`35`	`+ $this->payOperation = $payOperation;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`/**`