git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: conflict in settings.py
[myslice.git]
/
myslice
/
urls.py
diff --git
a/myslice/urls.py
b/myslice/urls.py
index
21bc8bd
..
6d22803
100644
(file)
--- a/
myslice/urls.py
+++ b/
myslice/urls.py
@@
-65,9
+65,6
@@
urlpatterns = patterns(
#
# various trash views - bound to go away
#
#
# various trash views - bound to go away
#
- (r'^tab/?$', 'trash.sampleviews.tab_view'),
- (r'^scroll/?$', 'trash.sampleviews.scroll_view'),
- (r'^plugin/?$', 'trash.pluginview.test_plugin_view'),
- (r'^dashboard/?$', 'trash.dashboard.dashboard_view'),
+ url(r'^trash/', include('trash.urls')),
)
)