diff options
| author | Chris Moylan <chris@chrismoylan.com> | 2011-07-05 21:42:18 -0500 |
|---|---|---|
| committer | Chris Moylan <chris@chrismoylan.com> | 2011-07-05 21:42:18 -0500 |
| commit | f0b497ec5a0ff3b5a74115f420cd9ddcf52db830 (patch) | |
| tree | 5c5662dd890cbfa494ef7ffc160fe6a64cdf9ec6 /mediagoblin/tests/test_config.py | |
| parent | 5e008b93f44b34078f64591f0c0ddc9205909926 (diff) | |
| parent | 5ed4722de8106a512a4faacfedaae7b8eda7260b (diff) | |
| download | mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.tar.lz mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.tar.xz mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.zip | |
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/tests/test_config.py')
| -rw-r--r-- | mediagoblin/tests/test_config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py index 244f05e5..f9f12072 100644 --- a/mediagoblin/tests/test_config.py +++ b/mediagoblin/tests/test_config.py @@ -16,7 +16,7 @@ import pkg_resources -from mediagoblin import config +from mediagoblin.init import config CARROT_CONF_GOOD = pkg_resources.resource_filename( |