From 0a5242c3a460d0b99be0adc4593774a58b68154a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 28 Apr 2014 00:29:11 -0400 Subject: fix bad merge --- app/models/match.rb | 4 ---- 1 file changed, 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? -- cgit v1.2.3