Merge branch 'master' into 11840-unique-constraint-untrash-coll

[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 subst
+import crunchutil.subst as subst
 import subprocess
 import os
 import hashlib