opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

merging conflicts

Browse Source
This commit is contained in:
Greg Von Kuster
2008-10-06 13:45:45 -04:00
parent 756490b0b3
commit d42e47e37c
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/data_destination/epigraph.xml
+1 -5
View File
@@ -1,9 +1,5 @@
<?xml version="1.0"?>
<<<<<<< local
<tool name="Perform genome" id="epigraph_export">
=======
<tool name="Perform genome" id="epigraph">
>>>>>>> other
<description> analysis and prediction with EpiGRAPH</description>
<redirect_url_params>GENOME=${input1.dbkey} NAME=${input1.name} INFO=${input1.info}</redirect_url_params>
<inputs>
@@ -13,7 +9,7 @@
</param>
<param name="REDIRECT_URL" type="hidden" value="http://epigraph.mpi-inf.mpg.de/WebGRAPH_Public_Test/faces/DataImport.jsp" />
<param name="DATA_URL" type="baseurl" value="/datasets" />
<param name="GALAXY_URL" type="baseurl" value="/dataset_import" />
<param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=epigraph_import"/>
</inputs>
<outputs/>
<help>