projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5493: add test for the getting_started help menu item.
[arvados.git]
/
crunch_scripts
/
collection-merge
diff --git
a/crunch_scripts/collection-merge
b/crunch_scripts/collection-merge
index 63b63fa95152375946a50ed4d4e1fd482e380c7a..ca80a82e3f26e7fc87a4373dbb7e7a529e37802e 100755
(executable)
--- a/
crunch_scripts/collection-merge
+++ b/
crunch_scripts/collection-merge
@@
-15,7
+15,7
@@
import arvados
import md5
import arvados
import md5
-import subst
+import
crunchutil.subst as
subst
import subprocess
import os
import hashlib
import subprocess
import os
import hashlib