External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source 
Signed-off-by: mazhead <mazhead@gmail.com>
This commit is contained in:
mazhead
2021-04-12 16:47:44 +02:00
parent c6eb7da68d
commit d479237734
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/migrations/0136_scm_track_submodules.py
View File

@@ -6,11 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
<<<<<<< HEAD:awx/main/migrations/0136_scm_track_submodules.py
('main', '0135_schedule_sort_fallback_to_id'), ('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 = [ operations = [