From a7d01503ef3c9dd2142a79c5ab100d0f5adfc6b0 Mon Sep 17 00:00:00 2001
From: PekopT <alex@brilliantov.me>
Date: Tue, 18 Oct 2016 01:15:35 +0300
Subject: [PATCH] merge migrations users

---
 users/migrations/0020_merge.py | 16 ++++++++++++++++
 users/urls.py                  |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 users/migrations/0020_merge.py

diff --git a/users/migrations/0020_merge.py b/users/migrations/0020_merge.py
new file mode 100644
index 0000000..79dde87
--- /dev/null
+++ b/users/migrations/0020_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-10-17 22:15
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0019_auto_20161014_2337'),
+        ('users', '0019_user_is_staff'),
+    ]
+
+    operations = [
+    ]
diff --git a/users/urls.py b/users/urls.py
index d5a54ff..1bf8480 100755
--- a/users/urls.py
+++ b/users/urls.py
@@ -27,7 +27,7 @@ urlpatterns = [
     urls.url(r'^(?P<pk>\d+)/financial-info/edit/$', UserFinancialInfoEditView.as_view(),
              name='user-financial-info-edit'),
 
-urls.url(r'^(?P<pk>\d+)/experience/edit/$', UserProfileEditView.as_view(), name='user-experience-edit'),
+    urls.url(r'^(?P<pk>\d+)/experience/edit/$', UserProfileEditView.as_view(), name='user-experience-edit'),
 
     urls.url(r'^customers/(?P<pk>\d+)/$', CustomerProfileOpenProjectsView.as_view(),
              name='customer-profile-open-projects'),