Solve rebase conflicts.

2026-03-01 08:48:46 -03:30 · 2016-10-17 17:08:05 -04:00
parent 21feae7c11
commit c595492950
2 changed files with 2 additions and 6 deletions
--- a/awx/main/migrations/0041_v310_job_timeout.py
+++ b/awx/main/migrations/0041_v310_job_timeout.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ('main', '0035_v310_jobevent_uuid'),
+        ('main', '0040_v310_artifacts'),
    ]

    operations = [