diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
| commit | f8e9b0349b82278c8fb015037e901dd5a77e30e7 (patch) | |
| tree | c54eae2919f7d6a8532527ec4db7b33c26b71a71 /app/views/tournaments/_form.html.erb | |
| parent | 8abfaf4ce71dff7294424a7cb37efe4db5e0d581 (diff) | |
| parent | e08e007a6c50e1959a29a9d18dec8c52146a233c (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/tournaments/_form.html.erb')
| -rw-r--r-- | app/views/tournaments/_form.html.erb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index a5eba7a..38f01ee 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -57,12 +57,6 @@ <%= f.label :scoring_method %> <%= f.select(:scoring_method, @tournament.scoring_methods.map{|method| [method.humanize.titleize, method]}) %> </p> - - <p> - <%= f.label :sampling_method %> - <%= f.select(:sampling_method, @tournament.sampling_methods.map{|method| [method.humanize, method]}) %> - </p> - </fieldset> <fieldset> |