zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-05 03:51:47 -05:00
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
parent 0694fa83b0 d1b89815f7
commit 979eaeddfa
1 changed files with 1 additions and 1 deletions
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): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('main', '0044_v330_add_inventory_update_inventory'), ('main', '0045_v330_instance_managed_by_policy'),
] ]
operations = [ operations = [