From 06c28384c1217e054f530df511b434ff543e3132 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 11 Jun 2017 19:34:43 +0200
Subject: [PATCH] Merge pull request #3082 from stevepiercy/master
---
docs/tutorials/wiki2/src/models/tutorial/__init__.py | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/docs/tutorials/wiki2/src/models/tutorial/__init__.py b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
index 7654fc8..4dab448 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
@@ -5,8 +5,6 @@
""" This function returns a Pyramid WSGI application.
"""
config = Configurator(settings=settings)
- settings = config.get_settings()
- settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'
config.include('pyramid_jinja2')
config.include('.models')
config.include('.routes')
--
Gitblit v1.9.3