Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev

Conflicts: client/galaxy/scripts/mvc/tool/tool-form-composite.js preserved dev version static/maps/mvc/tool/tool-form-composite.js.map static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/tool/tool-form-composite.js
2026-09-24 16:30:27 +08:00 · 2017-02-22 10:56:40 -05:00
parent 387805fc13 9563a691b0
commit d1c9ffb94c
6 changed files with 25 additions and 3 deletions
@@ -306,10 +306,7 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
                    var is_simple_input = ([ 'data_input', 'data_collection_input' ]).indexOf( step.step_type ) != -1;
                    _.each( step.inputs, function( input ) { input.flavor = 'module'; input.hide_label = is_simple_input; } );
                    form = new Form( Utils.merge({
-<<<<<<< HEAD
-=======
                        title    : '<b>' + step.name + '</b>' + step.description,
->>>>>>> release_17.01
                        onchange : function() { _.each( self.links[ step.index ], function( link ) { self._refreshStep( link ) } ) },
                        inputs   : step.inputs && step.inputs.length > 0 ? step.inputs : [ { type: 'hidden', name: 'No options available.', ignore: null } ]
                    }, step ) );