From 518bdf89075348c10abb17369eea419567d4ec3b Mon Sep 17 00:00:00 2001
From: Nicholas Totsch <nicholas.totsch@gmail.com>
Date: Tue, 31 Oct 2017 14:56:11 -0500
Subject: [PATCH] Fixed conflict #1

---
 netbox/dcim/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index c4b313cdd..37b89cac7 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -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):