diff options
| author | David Gay <oddshocks@gmail.com> | 2012-04-02 19:15:09 -0400 |
|---|---|---|
| committer | David Gay <oddshocks@gmail.com> | 2012-04-02 19:15:09 -0400 |
| commit | c4eff418cd44f889a3ec7a3ce891cf119a46214a (patch) | |
| tree | 3625af35acfad2e793c364f14300a49813117164 /docs/narr/views.rst | |
| parent | aa1b1eda9d2e507c2c0d7c12785d6f57bfa17129 (diff) | |
| parent | 9834f2a0d95126001d32c34b4f2bec2b980df55e (diff) | |
| download | pyramid-c4eff418cd44f889a3ec7a3ce891cf119a46214a.tar.gz pyramid-c4eff418cd44f889a3ec7a3ce891cf119a46214a.tar.bz2 pyramid-c4eff418cd44f889a3ec7a3ce891cf119a46214a.zip | |
Merge branch 'master' of github.com:oddshocks/pyramid
Conflicts:
docs/narr/views.rst
Diffstat (limited to 'docs/narr/views.rst')
| -rw-r--r-- | docs/narr/views.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/narr/views.rst b/docs/narr/views.rst index f6ee9a8d5..6291f01b4 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -578,7 +578,10 @@ access to the context via ``request.context``. Passing Configuration Variables to a View ----------------------------------------- +<<<<<<< HEAD +======= +>>>>>>> 9834f2a0d95126001d32c34b4f2bec2b980df55e For information on passing a variable from the configuration .ini files to a view, see :ref:`deployment_settings`. |