Mercurial > repos > bgruening > uniprot_rest_interface

diff tool_dependencies.xml.orig @ 0:48522382b6a4 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 2b8ad1bbfe098129ae32cd8311a755dff58ae97b-dirty
author bgruening
date Fri, 09 Oct 2015 16:42:22 -0400
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tool_dependencies.xml.orig	Fri Oct 09 16:42:22 2015 -0400
@@ -0,0 +1,11 @@
+<?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>