diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /app/views/matches/_form.html.erb | |
parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) |
Settled Merge Conflicts.
Diffstat (limited to 'app/views/matches/_form.html.erb')
-rw-r--r-- | app/views/matches/_form.html.erb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 3efb566..e2ec73b 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -12,6 +12,14 @@ <%= f.label :name %><br> <%= f.text_field :name %> </div> + <div class="field"> + <%= f.label :winner_id %><br> + <%= f.text_field :winner_id %> + </div> + <div class="field"> + <%= f.label :remote_id %><br> + <%= f.text_field :remote_id %> + </div> <div class="actions"> <%= f.submit %> </div> |