old_contents: """URLs module"""
  from django.conf import settings
  try:
      from django.conf.urls import url
  except ImportError:
      # Django < 1.4
      from django.conf.urls.defaults import url
  <<<<<<< HEAD
  
  =======
  >>>>>>> master
  
  from social.utils import setting_name
  from social.apps.django_app import views
  
  
  extra = getattr(settings, setting_name('TRAILING_SLASH'), True) and '/' or ''
  
  <<<<<<< HEAD
  
  =======
  >>>>>>> master
  urlpatterns = [
      # authentication / association
      url(r'^login/(?P<backend>[^/]+){0}$'.format(extra), views.auth,
          name='begin'),
      url(r'^complete/(?P<backend>[^/]+){0}$'.format(extra), views.complete,
          name='complete'),
      # disconnection
      url(r'^disconnect/(?P<backend>[^/]+){0}$'.format(extra), views.disconnect,
          name='disconnect'),
      url(r'^disconnect/(?P<backend>[^/]+)/(?P<association_id>[^/]+){0}$'
  <<<<<<< HEAD
              .format(extra), views.disconnect, name='disconnect_individual'),
  =======
          .format(extra), views.disconnect, name='disconnect_individual'),
  >>>>>>> master
  ]
  
new_contents: """URLs module"""
  from django.conf import settings
  try:
      from django.conf.urls import url
  except ImportError:
      # Django < 1.4
      from django.conf.urls.defaults import url
  
  from social.utils import setting_name
  from social.apps.django_app import views
  
  
  extra = getattr(settings, setting_name('TRAILING_SLASH'), True) and '/' or ''
  
  urlpatterns = [
      # authentication / association
      url(r'^login/(?P<backend>[^/]+){0}$'.format(extra), views.auth,
          name='begin'),
      url(r'^complete/(?P<backend>[^/]+){0}$'.format(extra), views.complete,
          name='complete'),
      # disconnection
      url(r'^disconnect/(?P<backend>[^/]+){0}$'.format(extra), views.disconnect,
          name='disconnect'),
      url(r'^disconnect/(?P<backend>[^/]+)/(?P<association_id>[^/]+){0}$'
          .format(extra), views.disconnect, name='disconnect_individual'),
  ]
  
subject: Fix django merge conflicts