summaryrefslogtreecommitdiff
path: root/testapp/templates
diff options
context:
space:
mode:
authorankitjavalkar2015-06-22 17:07:13 +0530
committerankitjavalkar2015-08-03 15:23:02 +0530
commit3f35f7dd0c79f76518a71f597b96c226d08157fb (patch)
treee718f17240f36d111b9bd25c619473d6105351d1 /testapp/templates
parent36d8e3decc13b775e7f464e891e400bc686da4b8 (diff)
downloadonline_test-3f35f7dd0c79f76518a71f597b96c226d08157fb.tar.gz
online_test-3f35f7dd0c79f76518a71f597b96c226d08157fb.tar.bz2
online_test-3f35f7dd0c79f76518a71f597b96c226d08157fb.zip
Remove taggit-autocomplete app, make pip compatible
Conflicts: testapp/templates/demo_urls.py
Diffstat (limited to 'testapp/templates')
-rw-r--r--testapp/templates/demo_settings.py1
-rw-r--r--testapp/templates/demo_urls.py13
2 files changed, 13 insertions, 1 deletions
diff --git a/testapp/templates/demo_settings.py b/testapp/templates/demo_settings.py
index d731dc2..45d437c 100644
--- a/testapp/templates/demo_settings.py
+++ b/testapp/templates/demo_settings.py
@@ -38,7 +38,6 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'testapp.exam',
'taggit',
- 'taggit_autocomplete_modified',
)
MIDDLEWARE_CLASSES = (
diff --git a/testapp/templates/demo_urls.py b/testapp/templates/demo_urls.py
new file mode 100644
index 0000000..275b281
--- /dev/null
+++ b/testapp/templates/demo_urls.py
@@ -0,0 +1,13 @@
+from django.conf.urls import patterns, include, url
+
+from django.contrib import admin
+admin.autodiscover()
+
+urlpatterns = patterns('',
+ # Examples:
+ # url(r'^$', 'my_demo.views.home', name='home'),
+ # url(r'^blog/', include('blog.urls')),
+
+ url(r'^admin/', include(admin.site.urls)),
+ url(r'^exam/', include('testapp.exam.urls')),
+)