External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2687 from AlanCoding/play_nice

Browse Source 
fix conflicting migrations
This commit is contained in:
Alan Rominger 2018-07-26 10:45:08 -04:00 committed by GitHub
commit 979eaeddfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0045_v330_remove_client_credentials_grant.py → awx/main/migrations/0046_v330_remove_client_credentials_grant.py
View File

@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0044_v330_add_inventory_update_inventory'),
('main', '0045_v330_instance_managed_by_policy'),
]
operations = [