From d1b89815f76d3b2161b5845b27d95fb30a3e6494 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 26 Jul 2018 10:38:26 -0400
Subject: [PATCH] fix conflicting migrations

---
 ...ls_grant.py => 0046_v330_remove_client_credentials_grant.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename awx/main/migrations/{0045_v330_remove_client_credentials_grant.py => 0046_v330_remove_client_credentials_grant.py} (91%)

diff --git a/awx/main/migrations/0045_v330_remove_client_credentials_grant.py b/awx/main/migrations/0046_v330_remove_client_credentials_grant.py
similarity index 91%
rename from awx/main/migrations/0045_v330_remove_client_credentials_grant.py
rename to awx/main/migrations/0046_v330_remove_client_credentials_grant.py
index db919c55b7..e4eca09fa8 100644
--- a/awx/main/migrations/0045_v330_remove_client_credentials_grant.py
+++ b/awx/main/migrations/0046_v330_remove_client_credentials_grant.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0044_v330_add_inventory_update_inventory'),
+        ('main', '0045_v330_instance_managed_by_policy'),
     ]
 
     operations = [