Merge pull request #328 from reduxionist/fix-squashed-socks_proxy-mig…

…ration Remove migration 0002_socks_proxy.py...
django-helpdesk · Jun 9, 2015 · 6595eeb · 6595eeb
2 parents 140c241 + f434292
commit 6595eeb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 34 deletions.
diff --git a/.../migrations/0003_populate_usersettings.py → .../migrations/0002_populate_usersettings.py b/.../migrations/0003_populate_usersettings.py → .../migrations/0002_populate_usersettings.py
@@ -43,7 +43,7 @@ def populate_usersettings(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('helpdesk', '0002_socks_proxy'),
+        ('helpdesk', '0001_initial'),
     ]
 
     operations = [

diff --git a/helpdesk/migrations/0002_socks_proxy.py b/helpdesk/migrations/0002_socks_proxy.py
diff --git a/...sk/migrations/0004_initial_data_import.py → ...sk/migrations/0003_initial_data_import.py b/...sk/migrations/0004_initial_data_import.py → ...sk/migrations/0003_initial_data_import.py
@@ -36,7 +36,7 @@ def unload_fixture(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('helpdesk', '0003_populate_usersettings'),
+        ('helpdesk', '0002_populate_usersettings'),
     ]
 
     operations = [