From ad89491a07d32c13659ba58eb09363bc3921fe64 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Tue, 12 Apr 2016 16:31:11 -0400 Subject: [PATCH] Fixed bad merge --- awx/main/migrations/0008_v300_rbac_changes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/main/migrations/0008_v300_rbac_changes.py b/awx/main/migrations/0008_v300_rbac_changes.py index e6c9e40582..8848bbabd7 100644 --- a/awx/main/migrations/0008_v300_rbac_changes.py +++ b/awx/main/migrations/0008_v300_rbac_changes.py @@ -170,7 +170,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='inventory', name='usage_role', - field=awx.main.fields.ImplicitRoleField(related_name='+', to='main.Role', null=b'True'), field=awx.main.fields.ImplicitRoleField(related_name='+', role_description=b'May use this inventory, but not read sensitive portions or modify it', parent_role=None, to='main.Role', role_name=b'Inventory User', null=b'True', permissions={b'use': True}), ), migrations.AddField(