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/tutorials/wiki/src/views | |
| 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/tutorials/wiki/src/views')
| -rw-r--r-- | docs/tutorials/wiki/src/views/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/views/tutorial/__init__.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py index 5d87fedbf..5ab4f73cd 100644 --- a/docs/tutorials/wiki/src/views/setup.py +++ b/docs/tutorials/wiki/src/views/setup.py @@ -10,6 +10,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f: requires = [ 'pyramid', + 'pyramid_chameleon', 'pyramid_zodbconn', 'transaction', 'pyramid_tm', diff --git a/docs/tutorials/wiki/src/views/tutorial/__init__.py b/docs/tutorials/wiki/src/views/tutorial/__init__.py index c3bb87a62..f2a86df47 100644 --- a/docs/tutorials/wiki/src/views/tutorial/__init__.py +++ b/docs/tutorials/wiki/src/views/tutorial/__init__.py @@ -12,6 +12,7 @@ def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ config = Configurator(root_factory=root_factory, settings=settings) + config.include('pyramid_chameleon') config.add_static_view('static', 'static', cache_max_age=3600) config.scan() return config.make_wsgi_app() |