2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/af15bddfe685/ Changeset: af15bddfe685 Branch: stable User: davebgx Date: 2014-03-07 15:42:39 Summary: Clean up another incorrectly resolved merge conflict. Affected #: 1 file diff -r 0bd594fc429dbad899a86495a3ab8683d6184159 -r af15bddfe6854f72d828b46490f8b6c3a4f79bfb lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -420,7 +420,6 @@ for tarball_name in tarball_names: cmd = '''PATH=$PATH:$R_HOME/bin; export PATH; R_LIBS=$INSTALL_DIR; export R_LIBS; Rscript -e "install.packages(c('%s'),lib='$INSTALL_DIR', repos=NULL, dependencies=FALSE)"''' % ( str( tarball_name ) ) - ( str( tarball_name ) ) cmd = install_environment.build_command( td_common_util.evaluate_template( cmd, install_dir ) ) return_code = handle_command( app, tool_dependency, install_dir, cmd ) if return_code: https://bitbucket.org/galaxy/galaxy-central/commits/49d20516d860/ Changeset: 49d20516d860 User: davebgx Date: 2014-03-07 15:45:24 Summary: Merge stable. Affected #: 1 file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.