Skip to content

Commit

Permalink
Fix import error (oscar.app.shop doesn't exist anymore)
Browse files Browse the repository at this point in the history
  • Loading branch information
mvantellingen committed May 4, 2015
1 parent e883d7f commit f0709f9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sandbox/sandbox/urls.py
@@ -1,10 +1,10 @@
from django.conf import settings
from django.contrib import admin
from django.conf.urls.static import static
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from oscar.app import application

from oscar.app import shop
from stores.app import application as stores_app
from stores.dashboard.app import application as dashboard_app

Expand All @@ -14,15 +14,15 @@
'packages': ('stores',),
}

urlpatterns = patterns('',
urlpatterns = [
url(r'^dashboard/stores/', include(dashboard_app.urls)),
url(r'^stores/', include(stores_app.urls)),
url(r'^', include(shop.urls)),
url(r'^', include(application.urls)),
url(r'^admin/', include(admin.site.urls)),
url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
url(r'^i18n/', include('django.conf.urls.i18n')),
)
]


if settings.DEBUG:
Expand Down

0 comments on commit f0709f9

Please sign in to comment.