Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Political Memory
memopol
Commits
489da9fc
Commit
489da9fc
authored
Feb 17, 2016
by
James Pic
Browse files
Merge pull request #55 from political-memory/url_conflicts
Fixed url conflicts
parents
83bfc3ef
1d2c09f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
memopol/urls.py
View file @
489da9fc
...
@@ -19,21 +19,21 @@ urlpatterns = [
...
@@ -19,21 +19,21 @@ urlpatterns = [
views
.
RepresentativeDetail
.
as_view
(),
views
.
RepresentativeDetail
.
as_view
(),
),
),
url
(
url
(
r
'legislature/representative/$'
,
r
'
^
legislature/representative/$'
,
views
.
RepresentativeList
.
as_view
(),
views
.
RepresentativeList
.
as_view
(),
),
),
url
(
url
(
r
'votes/dossier/$'
,
r
'
^
votes/dossier/$'
,
views
.
DossierList
.
as_view
(),
views
.
DossierList
.
as_view
(),
),
),
url
(
r
'^admin/'
,
include
(
admin
.
site
.
urls
)),
url
(
r
'^admin/'
,
include
(
admin
.
site
.
urls
)),
url
(
r
'legislature/'
,
include
(
'representatives.urls'
,
url
(
r
'
^
legislature/'
,
include
(
'representatives.urls'
,
namespace
=
'representatives'
)),
namespace
=
'representatives'
)),
url
(
r
'votes/'
,
include
(
'representatives_votes.urls'
,
url
(
r
'
^
votes/'
,
include
(
'representatives_votes.urls'
,
namespace
=
'representatives_votes'
)),
namespace
=
'representatives_votes'
)),
url
(
r
'positions/'
,
include
(
'representatives_positions.urls'
,
url
(
r
'
^
positions/'
,
include
(
'representatives_positions.urls'
,
namespace
=
'representatives_positions'
)),
namespace
=
'representatives_positions'
)),
url
(
r
'api/'
,
include
(
api
.
router
.
urls
)),
url
(
r
'
^
api/'
,
include
(
api
.
router
.
urls
)),
url
(
r
'^$'
,
generic
.
TemplateView
.
as_view
(
template_name
=
'home.html'
)),
url
(
r
'^$'
,
generic
.
TemplateView
.
as_view
(
template_name
=
'home.html'
)),
]
]
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment