from django.conf.urls import patterns, include, url
from django.conf import settings
from django.conf.urls.static import static
from django.contrib import admin
admin.autodiscover()

from tastypie.api import Api
from people.api import ArtistResource, StaffResource
<<<<<<< 9100186f39179ceb3ce72db4f7a6dfbc735d4b79
from production.api import InstallationResource, InstallationGenreResource, FilmResource, FilmGenreResource, PerformanceResource, EventResource, ExhibitionResource, ItineraryResource, ArtworkResource, ProductionStaffTaskResource, StaffTaskResource, ProductionOrganizationTaskResource, OrganizationTaskResource
=======
from production.api import InstallationResource, InstallationGenreResource, FilmResource, FilmGenreResource, PerformanceResource, EventResource, ExhibitionResource, ItineraryResource, ArtworkResource
>>>>>>> display installation / film  genre
from diffusion.api import PlaceResource
from school.api import PromotionResource, StudentResource, StudentApplicationResource


v1_api = Api(api_name='v1')
v1_api.register(InstallationGenreResource())
v1_api.register(InstallationResource())
v1_api.register(FilmResource())
v1_api.register(FilmGenreResource())
v1_api.register(PerformanceResource())
v1_api.register(EventResource())
v1_api.register(PromotionResource())
v1_api.register(StudentResource())
v1_api.register(StudentApplicationResource())
v1_api.register(ArtistResource())
v1_api.register(StaffResource())
v1_api.register(ProductionStaffTaskResource())
v1_api.register(StaffTaskResource())
v1_api.register(OrganizationTaskResource())
v1_api.register(ProductionOrganizationTaskResource())
v1_api.register(PlaceResource())
v1_api.register(ExhibitionResource())
v1_api.register(ItineraryResource())
v1_api.register(ArtworkResource())

urlpatterns = patterns('',
                       # Examples:
                       # url(r'^$', 'ifresnoy.views.home', name='home'),
                       # url(r'^blog/', include('blog.urls')),
                       #(r'^v2/', include(v2_api.urls)),
                       (r'^', include(v1_api.urls)),
                       (r'^grappelli/', include('grappelli.urls')),
                       url('^markdown/', include('django_markdown.urls')),
                       url(r'v1/doc/',
                           include('tastypie_swagger.urls', namespace='ifresnoy_tastypie_swagger'),
                           kwargs={"tastypie_api_module": "ifresnoy.urls.v1_api",
                                   "namespace": "ifresnoy_tastypie_swagger"}),
                       url(r'^admin/', include(admin.site.urls)) \
                       ) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
                       


urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

@@ -262,56 +262,8 @@
 rce%0A
-%3C%3C%3C%3C%3C%3C%3C 9100186f39179ceb3ce72db4f7a6dfbc735d4b79
 %0Afro
@@ -573,259 +573,8 @@
 rce%0A
-=======%0Afrom production.api import InstallationResource, InstallationGenreResource, FilmResource, FilmGenreResource, PerformanceResource, EventResource, ExhibitionResource, ItineraryResource, ArtworkResource%0A%3E%3E%3E%3E%3E%3E%3E display installation / film  genre%0A
 from
@@ -2371,39 +2371,16 @@
 C_ROOT)%0A
-                       
 %0A%0A%0Aurlpa

fix bug