old_contents: from django.conf import settings
  from django.conf.urls import patterns, include, url
  
  from rest_framework.routers import DefaultRouter
  from rest_framework_jwt.views import ObtainJSONWebToken
  
  from users.serializers import AuthSerializer
  from users.views import UserViewSet
  from cheeps.views import CheepViewSet
  
  
  router = DefaultRouter()
  router.register(r'users', UserViewSet)
  router.register(r'cheeps', CheepViewSet)
  
  urlpatterns = patterns('',
    url(r'^', include(router.urls)),
    url(r'^auth-session/', ObtainJSONWebToken.as_view(serializer_class=AuthSerializer)),
    url(r'^auth-token/', 'rest_framework_jwt.views.obtain_jwt_token'),
  )
  
  if settings.DEBUG:
      urlpatterns += patterns('',
          url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
              'document_root': settings.MEDIA_ROOT,
          }),
      )
  
new_contents: from django.conf import settings
  from django.conf.urls import patterns, include, url
  
  from rest_framework.routers import DefaultRouter
  from rest_framework_jwt.views import ObtainJSONWebToken
  
  from users.serializers import AuthSerializer
  from users.views import UserViewSet
  from cheeps.views import CheepViewSet
  
  
  router = DefaultRouter()
  router.register(r'users', UserViewSet)
  router.register(r'cheeps', CheepViewSet)
  
  urlpatterns = patterns('',
    url(r'^', include(router.urls)),
    url(r'^auth-session/', include('rest_framework.urls', namespace='rest_framework')),
    url(r'^auth-token/', ObtainJSONWebToken.as_view(serializer_class=AuthSerializer)),
  )
  
  if settings.DEBUG:
      urlpatterns += patterns('',
          url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
              'document_root': settings.MEDIA_ROOT,
          }),
      )
  
subject: Fix hasty manual merge