details: http://www.bx.psu.edu/hg/galaxy/rev/7df2ad00be1d changeset: 3320:7df2ad00be1d user: jeremy goecks <jeremy.goecks@emory.edu> date: Wed Feb 03 11:30:06 2010 -0500 description: Merge in history.mako. diffstat: templates/root/history.mako | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diffs (23 lines): diff -r 63201eefad88 -r 7df2ad00be1d templates/root/history.mako --- a/templates/root/history.mako Wed Feb 03 11:27:21 2010 -0500 +++ b/templates/root/history.mako Wed Feb 03 11:30:06 2010 -0500 @@ -308,11 +308,6 @@ ## Annotation elt. <div id="history-annotation-area" class="form-row"> -<<<<<<< local - <label>Annotation / Notes:</label> - <div style="float: right"><a id="history-annotate" title="Annotate" class="icon-button edit" target="galaxy_main" href="${h.url_for( controller='history', action='annotate_async' )}"></a></div> - <div id="history-annotation">${annotation}</div> -======= <label>Annotation / Notes:</label> <div style="float: right"><a id="history-annotate" title="Annotate" class="icon-button edit" target="galaxy_main" href="${h.url_for( controller='history', action='annotate_async' )}"></a></div> %if annotation: @@ -320,7 +315,6 @@ %else: <div id="history-annotation"></div> %endif ->>>>>>> other <div style="clear: both"></div> </div> </div>