From c8d76dbe78c0f258cd91556793097281fc7800fc Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 27 Sep 2018 11:48:59 -0400
Subject: [PATCH] update migration after rebase

---
 .../{0048_v330_split_jobs.py => 0050_v340_split_jobs.py}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename awx/main/migrations/{0048_v330_split_jobs.py => 0050_v340_split_jobs.py} (95%)

diff --git a/awx/main/migrations/0048_v330_split_jobs.py b/awx/main/migrations/0050_v340_split_jobs.py
similarity index 95%
rename from awx/main/migrations/0048_v330_split_jobs.py
rename to awx/main/migrations/0050_v340_split_jobs.py
index 17c6ab65ca..f946d22896 100644
--- a/awx/main/migrations/0048_v330_split_jobs.py
+++ b/awx/main/migrations/0050_v340_split_jobs.py
@@ -10,7 +10,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0047_v330_activitystream_instance'),
+        ('main', '0049_v330_validate_instance_capacity_adjustment'),
     ]
 
     operations = [