From d479237734a8e11673bc336d02c70d411bef042e Mon Sep 17 00:00:00 2001 From: mazhead Date: Mon, 12 Apr 2021 16:47:44 +0200 Subject: [PATCH] Fix merge issue Signed-off-by: mazhead --- awx/main/migrations/0136_scm_track_submodules.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/awx/main/migrations/0136_scm_track_submodules.py b/awx/main/migrations/0136_scm_track_submodules.py index 132dc63636..7a561708b1 100644 --- a/awx/main/migrations/0136_scm_track_submodules.py +++ b/awx/main/migrations/0136_scm_track_submodules.py @@ -6,11 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ -<<<<<<< HEAD:awx/main/migrations/0136_scm_track_submodules.py ('main', '0135_schedule_sort_fallback_to_id'), -======= - ('main', '0131_undo_org_polymorphic_ee'), ->>>>>>> Update and rename 0124_scm_track_submodules.py to 0132_scm_track_submodules.py:awx/main/migrations/0132_scm_track_submodules.py ] operations = [