Settled Merge Conflicts.

4 files changed, 4 insertions, 21 deletions

diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 38855a0..fe92318 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -24,24 +24,8 @@
     <%= f.number_field :status %>
   </div>
   <div class="field">
-    <%= f.label :min_players_per_team %><br>
-    <%= f.number_field :min_players_per_team %>
-  </div>
-  <div class="field">
-    <%= f.label :max_players_per_team %><br>
-    <%= f.number_field :max_players_per_team %>
-  </div>
-  <div class="field">
-    <%= f.label :min_teams_per_match %><br>
-    <%= f.number_field :min_teams_per_match %>
-  </div>
-  <div class="field">
-    <%= f.label :max_teams_per_match %><br>
-    <%= f.number_field :max_teams_per_match %>
-  </div>
-  <div class="field">
-    <%= f.label :set_rounds %><br>
-    <%= f.number_field :set_rounds %>
+    <%= f.label :ger %><br>
+    <%= f.text_field :ger %>
   </div>
   <div class="field">
     <%= f.label :randomized_teams %><br>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index b7c9118..6a86955 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -43,7 +43,6 @@
       </div>
     <% end %>
 
-
   </div>
 <% else %>
   <p class="no-entries"> No tournaments going on right now... Why not start your own? </p>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 4038f04..653442f 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@tournaments) do |tournament|
-  json.extract! tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
+  json.extract! tournament, :id, :name, :game_id, :status, :ger, :randomized_teams
   json.url tournament_url(tournament, format: :json)
 end
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index 27fd5c0..d70a27a 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at
+json.extract! @tournament, :id, :name, :game_id, :status, :ger, :randomized_teams, :created_at, :updated_at