summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-28 00:29:11 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-28 00:29:11 -0400
commit0a5242c3a460d0b99be0adc4593774a58b68154a (patch)
tree3273b4c7af1fa81198456cc79fe52eb51036038f
parentfcc89e5f2621f1fb0593c1fef4a6d15b9cf4fc70 (diff)
fix bad merge
-rw-r--r--app/models/match.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/match.rb b/app/models/match.rb
index 460e7c4..3cbe0da 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -49,10 +49,6 @@ class Match < ActiveRecord::Base
return html.html_safe
end
- def finished?
- # TODO
- end
-
private
def figure_sampling_methods
if @sampling_methods.nil?