Merge remote-tracking branch 'origin/MAGETWO-42947' into BugsS4

Maksym Aposov · Maksym Aposov · commit 214740f8a4c0 · 2016-02-01T15:53:44.000+02:00
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
@@ -134,6 +134,7 @@ define([
                     if ($('frontend_input') && $('frontend_input').value === 'multiselect') {
                         optionDefaultInputType = 'checkbox';
                     }
+
                     return optionDefaultInputType;
                 }
             };

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ define([`
`134`	`134`	`if ($('frontend_input') && $('frontend_input').value === 'multiselect') {`
`135`	`135`	`optionDefaultInputType = 'checkbox';`
`136`	`136`	`}`
	`137`	`+`
`137`	`138`	`return optionDefaultInputType;`
`138`	`139`	`}`
`139`	`140`	`};`