Merged in nitesh1989/galaxy-central3 (pull request #615)

"shed_tool_conf.xml.sample" is located inside config directory. Only seems logical that "shed_tool_conf.xml" should be in config also.
This commit is contained in:
Dannon Baker
2014-12-16 15:48:44 -05:00
+1 -1
View File
@@ -136,7 +136,7 @@ paste.app_factory = galaxy.web.buildapp:app_factory
# Tools can be locally developed or installed from Galaxy tool sheds.
# (config/tool_conf.xml.sample will be used if left unset and
# config/tool_conf.xml does not exist).
#tool_config_file = config/tool_conf.xml,shed_tool_conf.xml
#tool_config_file = config/tool_conf.xml,config/shed_tool_conf.xml
# Enable / disable checking if any tools defined in the above non-shed tool_config_files
# (i.e., tool_conf.xml) have been migrated from the Galaxy code distribution to the Tool