diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
| commit | 6a28ee15243fa1a3ae918d176cc6629c1cacfb7e (patch) | |
| tree | 98576c6ad37cf7c6c0cfaf62b635723380cc2393 /docs/narr/MyProject | |
| parent | fc477b2e4b20ae2788e468e45b2831e774be8ced (diff) | |
| parent | bd5a7ff20d9bdeaf36ef4154cbb0322696a46e2b (diff) | |
| download | pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.gz pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.bz2 pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.zip | |
fix merge conflict
Diffstat (limited to 'docs/narr/MyProject')
| -rw-r--r-- | docs/narr/MyProject/myproject/__init__.py | 1 | ||||
| -rw-r--r-- | docs/narr/MyProject/setup.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py index 6c512f52f..ad5ecbc6f 100644 --- a/docs/narr/MyProject/myproject/__init__.py +++ b/docs/narr/MyProject/myproject/__init__.py @@ -5,6 +5,7 @@ def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ config = Configurator(settings=settings) + config.include('pyramid_chameleon') config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('home', '/') config.scan() diff --git a/docs/narr/MyProject/setup.py b/docs/narr/MyProject/setup.py index 6969c73e7..a23f46c91 100644 --- a/docs/narr/MyProject/setup.py +++ b/docs/narr/MyProject/setup.py @@ -10,6 +10,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f: requires = [ 'pyramid', + 'pyramid_chameleon', 'pyramid_debugtoolbar', 'waitress', ] |