1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a0db2696ba21/ changeset: a0db2696ba21 user: inithello date: 2013-01-18 17:42:35 summary: Removed hg merge conflict markers. affected #: 1 file diff -r 864e960c52474fe6cb19129196b0ccccf48856bd -r a0db2696ba21ff636d3fd75699fe995c0e8c2262 templates/tool_form.mako --- a/templates/tool_form.mako +++ b/templates/tool_form.mako @@ -150,25 +150,17 @@ %><div class="form-title-row"><strong>${input.title} ${i + 1}</strong></div> ${do_inputs( input.inputs, repeat_state[i], rep_errors, prefix + input.name + "_" + str(index) + "|", other_values )} -<<<<<<< local - <div class="form-row"><input type="submit" class="btn" name="${prefix}${input.name}_${index}_remove" value="Remove ${input.title} ${i+1}"></div> -======= %if input.min < num_repeats: <div class="form-row"><input type="submit" name="${prefix}${input.name}_${index}_remove" value="Remove ${input.title} ${i+1}"></div> %endif ->>>>>>> other </div> %if rep_errors.has_key( '__index__' ): <div><img style="vertical-align: middle;" src="${h.url_for('/static/style/error_small.png')}"> <span style="vertical-align: middle;">${rep_errors['__index__']}</span></div> %endif %endfor -<<<<<<< local - <div class="form-row"><input type="submit" class="btn" name="${prefix}${input.name}_add" value="Add new ${input.title}"></div> -======= %if input.max > num_repeats: <div class="form-row"><input type="submit" name="${prefix}${input.name}_add" value="Add new ${input.title}"></div> %endif ->>>>>>> other </div> %elif input.type == "conditional": <% Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.