summaryrefslogtreecommitdiff
path: root/morphlib/__init__.py
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-01-28 16:57:18 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-01-28 16:57:18 +0000
commite97bd4be721834e24c32838c2ecd5149ef7c7101 (patch)
tree195e2ecfa8afb38522b81ed030588eed8785017f /morphlib/__init__.py
parent2024583a303ef1a79709b7ecc9fc2dce22e8ce98 (diff)
parente6dc394c0f31429b2f54c77b20223651a0ab68ee (diff)
downloadmorph-e97bd4be721834e24c32838c2ecd5149ef7c7101.tar.gz
Merge branch 'jjardon/yaml-v2'
Diffstat (limited to 'morphlib/__init__.py')
-rw-r--r--morphlib/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py
index 2d2f68a2..aba7a4d6 100644
--- a/morphlib/__init__.py
+++ b/morphlib/__init__.py
@@ -57,5 +57,6 @@ import stagingarea
import stopwatch
import tempdir
import util
+import yamlparse
import app # this needs to be last