diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
| commit | a683a208e31d5bafe7658521921f9f2c1a637418 (patch) | |
| tree | abf23ef14f584583973796b3da573c5061eb8533 /test/models | |
| parent | aeda550c2ad04c9496a803b1d7f1d34a4566a9fe (diff) | |
| parent | d8acc6785ee41a2628cd0d59d91916b2f087290b (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/views/tournaments/show.html.erb
Diffstat (limited to 'test/models')
| -rw-r--r-- | test/models/game_setting_test.rb (renamed from test/models/game_option_test.rb) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/models/game_option_test.rb b/test/models/game_setting_test.rb index 1ae5701..8ab8bcf 100644 --- a/test/models/game_option_test.rb +++ b/test/models/game_setting_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class GameOptionTest < ActiveSupport::TestCase +class GameSettingTest < ActiveSupport::TestCase # test "the truth" do # assert true # end |