diff options
Diffstat (limited to 'docs')
| -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`. |