Mercurial > repos > bgruening > uniprot_rest_interface

changeset 3:df4c547b2533 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/uniprot_rest_interface commit 074fed99c6df6bad17341bbfa57645f222907ad4
author bgruening
date Mon, 10 Apr 2017 13:24:24 -0400
parents fe94765e8814
children 144e9558d3fd
files tool_dependencies.xml.orig
diffstat 1 files changed, 0 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml.orig	Mon Apr 10 13:19:36 2017 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<tool_dependency>
-<<<<<<< HEAD:tools/uniprot_id_mapping/tool_dependencies.xml
-    <package name="requests" version="2.7">
-        <repository name="package_requests_2_7" owner="iuc" />
-=======
-    <package name="request" version="2.7">
-        <repository name="package_python_2_7_request_2_7" owner="iuc" />
->>>>>>> dc07b37de57cdd358da4ecabd9558736d5b80f97:tools/uniprot_rest_interface/tool_dependencies.xml
-    </package>
-</tool_dependency>