diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
| commit | 3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (patch) | |
| tree | e59dc46b293cdcd4ad8ad5b33bd4703f65adb0d9 /app/views/tournaments/_form.html.erb | |
| parent | ce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff) | |
| parent | 70bae69d731afc5300ffa5b176732ebe27d0810f (diff) | |
Fixed some merge errors in show.html.erb
Diffstat (limited to 'app/views/tournaments/_form.html.erb')
| -rw-r--r-- | app/views/tournaments/_form.html.erb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index c2c0ba7..d098cbb 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -16,6 +16,10 @@ <%= f.text_field :game_id %> </div> <div class="field"> + <%= f.label :status %><br> + <%= f.number_field :status %> + </div> + <div class="field"> <%= f.label :min_players_per_team %><br> <%= f.number_field :min_players_per_team %> </div> @@ -39,10 +43,6 @@ <%= f.label :randomized_teams %><br> <%= f.check_box :randomized_teams %> </div> - <div class="field"> - <%= f.label :status %><br> - <%= f.number_field :status %> - </div> <div class="actions"> <%= f.submit %> </div> |