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

resolve conflict: settings/defaults.py

Browse Source
This commit is contained in:
sundeep-co-in
2016-11-02 15:19:57 +05:30
parent 4237b2e207 6d57d8f40b
commit 688b5fef68
82 changed files with 2127 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/conf/migrations/0002_v310_copy_tower_settings.py
View File

@@ -69,11 +69,11 @@ class Migration(migrations.Migration):
dependencies = [
('conf', '0001_initial'),
('main', '0035_v310_jobevent_uuid'),
('main', '0036_v310_jobevent_uuid'),
]
run_before = [
('main', '0036_v310_remove_tower_settings'),
('main', '0037_v310_remove_tower_settings'),
]
operations = [