diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-05 09:56:03 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-05 09:57:44 +0000 |
| commit | f3197d814a5e883f47631a4f0acfa51bd1285daf (patch) | |
| tree | b1353461cfa944c62a7bfbbc8fb51664581bfe27 /morphlib/__init__.py | |
| parent | a4f5d580dfe9b1715e24dd1b49dde4f1d240b880 (diff) | |
| parent | fb7eb661b2b02bf049d24fa4a232f303b5058b1b (diff) | |
| download | morph-f3197d814a5e883f47631a4f0acfa51bd1285daf.tar.gz | |
Merge remote-tracking branch 'origin/sam/rename-builder2'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Diffstat (limited to 'morphlib/__init__.py')
| -rw-r--r-- | morphlib/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py index 8319430c..0d445304 100644 --- a/morphlib/__init__.py +++ b/morphlib/__init__.py @@ -56,7 +56,7 @@ import buildbranch import buildcommand import buildenvironment import buildsystem -import builder2 +import builder import cachedrepo import cachekeycomputer import extensions |