Settled Merge Conflicts.

3 files changed, 9 insertions, 2 deletions

diff --git a/test/models/server_settings_test.rb b/test/models/remote_username_test.rb
index 470b316..3321b6c 100644
--- a/test/models/server_settings_test.rb
+++ b/test/models/remote_username_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ServerSettingsTest < ActiveSupport::TestCase
+class RemoteUsernameTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/models/tournament_option_test.rb b/test/models/server_setting_test.rb
index 8fa9628..eee32c1 100644
--- a/test/models/tournament_option_test.rb
+++ b/test/models/server_setting_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TournamentOptionTest < ActiveSupport::TestCase
+class ServerSettingTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/models/tournament_preference_test.rb b/test/models/tournament_preference_test.rb
new file mode 100644
index 0000000..e200b8e
--- /dev/null
+++ b/test/models/tournament_preference_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentPreferenceTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end