From 3b4b0be08e4594cf646144cba9651d499b8490d1 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 20 Feb 2020 11:20:11 +0100 Subject: [PATCH] M #-: Removed merge leftovers --- src/sunstone/public/app/utils/wizard-fields.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/sunstone/public/app/utils/wizard-fields.js b/src/sunstone/public/app/utils/wizard-fields.js index 4c250bd663..e75496ab62 100644 --- a/src/sunstone/public/app/utils/wizard-fields.js +++ b/src/sunstone/public/app/utils/wizard-fields.js @@ -34,17 +34,11 @@ define(function(require) { var fields = $('[wizard_field]', context); fields.each(function() { var field = $(this); -<<<<<<< HEAD - if( - field.prop('wizard_field_disabled') != true && - field.val() != null && field.val().length && -======= var field_default = field.attr('default'); var field_value = field.val() || field_default; if ( field.prop('wizard_field_disabled') != true && field_value != null && field_value.length && ->>>>>>> flow-queue (field.attr("type") != "checkbox" || field.prop("checked")) && (field.attr("type") != "radio" || field.prop("checked")) ) {