fix merge conflict

1 files changed, 2 insertions, 0 deletions

diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index c12a5abb4..96515c195 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -611,6 +611,7 @@ A user might make use of these framework components like so:
 
    from webob import Response
    from pyramid.config import Configurator
+   import pyramid_handlers
    from paste.httpserver import serve
 
    class MyController(BaseController):
@@ -619,6 +620,7 @@ A user might make use of these framework components like so:
 
    if __name__ == '__main__':
        config = Configurator()
+       config.include(pyramid_handlers)
        config.add_handler('one', '/{id}', MyController, action='index')
        config.add_handler('two', '/{action}/{id}', MyController)
        serve(config.make_wsgi_app())