diff options
| author | David Gay <oddshocks@gmail.com> | 2012-04-02 19:18:09 -0400 |
|---|---|---|
| committer | David Gay <oddshocks@gmail.com> | 2012-04-02 19:18:09 -0400 |
| commit | 77e06770dc174f4269c50bb5443c4b67bc6d3da2 (patch) | |
| tree | 158d62fdde2f6a15eea9fc14fc2679d978929788 /docs | |
| parent | c4eff418cd44f889a3ec7a3ce891cf119a46214a (diff) | |
| download | pyramid-77e06770dc174f4269c50bb5443c4b67bc6d3da2.tar.gz pyramid-77e06770dc174f4269c50bb5443c4b67bc6d3da2.tar.bz2 pyramid-77e06770dc174f4269c50bb5443c4b67bc6d3da2.zip | |
removed strange text that showed up
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/views.rst | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/narr/views.rst b/docs/narr/views.rst index 6291f01b4..f6ee9a8d5 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -578,10 +578,7 @@ 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`. |