# HG changeset patch # User melissacline # Date 1426041467 25200 # Node ID 86306f41f941dc7e8c5ef9d5d42300f2f3752de2 # Parent d9c36f0aa1d3cdf1e162b3e816dbb052046fa8dd# Parent d0b8c8eee9d5cd2ad55a28a8bed18a59edd32de3 Trying to get out of merge hell diff -r d0b8c8eee9d5 -r 86306f41f941 tool_dependencies.xml --- a/tool_dependencies.xml Tue Mar 10 19:32:14 2015 -0700 +++ b/tool_dependencies.xml Tue Mar 10 19:37:47 2015 -0700 @@ -1,6 +1,5 @@ -