From f67c85c4bcf81c3d128cd164194912993d3f71ff Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Fri, 22 Nov 2013 12:25:30 +0100
Subject: [PATCH] fix ROOT_URLCONF, remove markup app

---
 pyweb/settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyweb/settings.py b/pyweb/settings.py
index b652d81..1bd705b 100644
--- a/pyweb/settings.py
+++ b/pyweb/settings.py
@@ -240,7 +240,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware'
 )
 
-ROOT_URLCONF = 'pyweb.urls'
+ROOT_URLCONF = 'urls'
 
 if THEME:
 	TEMPLATE_DIRS = [ join( MUMBLE_DJANGO_ROOT, 'themes', THEME ) ]
@@ -279,7 +279,6 @@ INSTALLED_APPS = [
     'django.contrib.admindocs',
     'django.contrib.contenttypes',
     'django.contrib.messages',
-    'django.contrib.markup',
     'django.contrib.staticfiles',
     'django.contrib.sessions',
     'django.contrib.sites',