Resolve merge conflict for bug/wrong-behavior-of-grid-row-click

Den4ik · Den4ik · commit 8b7458e01f8c · 2019-12-17T22:21:06.000+03:00
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -169,7 +169,7 @@ define([
         },
 
         selectAddress: function (el, container) {
-            id = el.value;
+            var id = el.value;
             if (id.length == 0) {
                 id = '0';
             }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ define([`
`169`	`169`	`},`
`170`	`170`
`171`	`171`	`selectAddress: function (el, container) {`
`172`		`- id = el.value;`
	`172`	`+ var id = el.value;`
`173`	`173`	`if (id.length == 0) {`
`174`	`174`	`id = '0';`
`175`	`175`	`}`