Mercurial > repos > melissacline > ucsc_cancer_utilities
annotate tool_dependencies.xml @ 24:1d83dbbee373
Fixing a merge conflict
author | melissacline |
---|---|
date | Mon, 20 Jul 2015 15:41:22 -0700 |
parents | 7346e5bab4ec |
children | 80b6b64e8b5e |
rev | line source |
---|---|
0 | 1 <?xml version="1.0"?> |
2 <tool_dependency> | |
22
13de7f5edd3a
Rolled the synapseClient dependency back to version 1.0
melissacline
parents:
16
diff
changeset
|
3 <package name="synapseClient" version="1.0"> |
13de7f5edd3a
Rolled the synapseClient dependency back to version 1.0
melissacline
parents:
16
diff
changeset
|
4 <install version="1.0"> |
23 | 5 <actions> |
14
d0b8c8eee9d5
Committing changes that hadn't made it in yet, merge hell
melissacline
parents:
12
diff
changeset
|
6 <action type="setup_virtualenv"> |
d0b8c8eee9d5
Committing changes that hadn't made it in yet, merge hell
melissacline
parents:
12
diff
changeset
|
7 synapseclient |
d0b8c8eee9d5
Committing changes that hadn't made it in yet, merge hell
melissacline
parents:
12
diff
changeset
|
8 </action> |
d0b8c8eee9d5
Committing changes that hadn't made it in yet, merge hell
melissacline
parents:
12
diff
changeset
|
9 </actions> |
d0b8c8eee9d5
Committing changes that hadn't made it in yet, merge hell
melissacline
parents:
12
diff
changeset
|
10 </install> |
0 | 11 </package> |
12 </tool_dependency> |