# HG changeset patch
# User bgruening
# Date 1491845064 14400
# Node ID df4c547b2533e8e62693303b8f2781881d8b83f5
# Parent  fe94765e88140d54f56ccc8ba9ea52c2137537e7
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/uniprot_rest_interface commit 074fed99c6df6bad17341bbfa57645f222907ad4

diff -r fe94765e8814 -r df4c547b2533 tool_dependencies.xml.orig
--- 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>