From 77e06770dc174f4269c50bb5443c4b67bc6d3da2 Mon Sep 17 00:00:00 2001 From: David Gay Date: Mon, 2 Apr 2012 19:18:09 -0400 Subject: removed strange text that showed up --- docs/narr/views.rst | 3 --- 1 file changed, 3 deletions(-) (limited to 'docs/narr') 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`. -- cgit v1.2.3