# HG changeset patch # User melissacline # Date 1437432209 25200 # Node ID 80b6b64e8b5e5f06d6bc7ca597d1e7f73326c702 # Parent 1d83dbbee373cd0822cd709fc85cebfb222926cb Fixing another merge conflict diff -r 1d83dbbee373 -r 80b6b64e8b5e tool_dependencies.xml --- a/tool_dependencies.xml Mon Jul 20 15:41:22 2015 -0700 +++ b/tool_dependencies.xml Mon Jul 20 15:43:29 2015 -0700 @@ -3,7 +3,7 @@ - + synapseclient