Fixed conflict #1

This commit is contained in:
Nicholas Totsch 2017-10-31 14:56:11 -05:00 committed by GitHub
parent a62d4645ac
commit 518bdf8907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -381,7 +381,7 @@ class RackReservationForm(BootstrapMixin, TenancyForm, forms.ModelForm):
class Meta:
model = RackReservation
fields = ['units', 'tenant_group', 'tenant', 'description']
fields = ['units', 'user', 'tenant_group', 'tenant', 'description']
def __init__(self, *args, **kwargs):