From 2a504ff0402920e280c19edc08a5e0e382e2ec11 Mon Sep 17 00:00:00 2001
From: Matthew Jones <matburt@redhat.com>
Date: Thu, 20 Oct 2016 14:42:12 -0400
Subject: [PATCH] Shift migration files around for conflict

---
 .../{0041_v310_executionnode.py => 0042_v310_executionnode.py}  | 2 +-
 .../{0042_v310_scm_revision.py => 0043_v310_scm_revision.py}    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename awx/main/migrations/{0041_v310_executionnode.py => 0042_v310_executionnode.py} (90%)
 rename awx/main/migrations/{0042_v310_scm_revision.py => 0043_v310_scm_revision.py} (94%)

diff --git a/awx/main/migrations/0041_v310_executionnode.py b/awx/main/migrations/0042_v310_executionnode.py
similarity index 90%
rename from awx/main/migrations/0041_v310_executionnode.py
rename to awx/main/migrations/0042_v310_executionnode.py
index abcf07e59a..f696d4b95d 100644
--- a/awx/main/migrations/0041_v310_executionnode.py
+++ b/awx/main/migrations/0042_v310_executionnode.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0040_v310_artifacts'),
+        ('main', '0041_v310_job_timeout'),
     ]
 
     operations = [
diff --git a/awx/main/migrations/0042_v310_scm_revision.py b/awx/main/migrations/0043_v310_scm_revision.py
similarity index 94%
rename from awx/main/migrations/0042_v310_scm_revision.py
rename to awx/main/migrations/0043_v310_scm_revision.py
index 2de25c082c..7936d8b0a1 100644
--- a/awx/main/migrations/0042_v310_scm_revision.py
+++ b/awx/main/migrations/0043_v310_scm_revision.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0041_v310_executionnode'),
+        ('main', '0042_v310_executionnode'),
     ]
 
     operations = [