diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
| commit | c1c331e7c545c7a2f0545d3b1ef9751c9571d357 (patch) | |
| tree | d2a4edf71f2c7204808e4543f3d743a81e95a1bd /morphlib/__init__.py | |
| parent | b2786c73c0f4d4b76f824e309598ce57065e30ab (diff) | |
| parent | 5f705f1e2c95b988ae39df7820f4034c49f375e4 (diff) | |
| download | morph-c1c331e7c545c7a2f0545d3b1ef9751c9571d357.tar.gz | |
Merge branch 'baserock/adamcoldrick/remove-morph2-tweaked'
Reviewed-by:
Richard Maw
Diffstat (limited to 'morphlib/__init__.py')
| -rw-r--r-- | morphlib/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py index 0c928fd3..f98c11aa 100644 --- a/morphlib/__init__.py +++ b/morphlib/__init__.py @@ -68,10 +68,9 @@ import gitindex import localartifactcache import localrepocache import mountableimage -import morph2 import morphologyfactory import morphologyfinder -import morph3 +import morphology import morphloader import morphset import remoteartifactcache |