From 8d5325cd6019b784ba2da66d19c41daaadbc19e0 Mon Sep 17 00:00:00 2001
From: shumakl <shumakl@purdue.edu>
Date: Thu, 3 Apr 2014 12:14:48 -0400
Subject: do things to avoid merge conflicts with clean2

---
 app/views/tournaments/show.html.erb | 81 ++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

(limited to 'app')

diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 7bdbdc0..1ebf4c5 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -11,45 +11,45 @@
 
 <span id="tournament-side-params">
 
+<p>
+  <strong>Status:</strong>
+  <% if @tournament.status == 0 %>
+    Waiting for players...
+  <% else %>
+    Started
+  <% end %>
+</p>
+
+<p>
+  <strong>Min players per team:</strong>
+  <%= @tournament.min_players_per_team %>
+</p>
+
+<p>
+  <strong>Max players per team:</strong>
+  <%= @tournament.max_players_per_team %>
+</p>
+
+<p>
+  <strong>Min teams per match:</strong>
+  <%= @tournament.min_teams_per_match %>
+</p>
+
+<p>
+  <strong>Max teams per match:</strong>
+  <%= @tournament.max_teams_per_match %>
+</p>
+
+<p>
+  <strong>Set rounds:</strong>
+  <%= @tournament.set_rounds %>
+</p>
+
+<p>
+  <strong>Randomized teams:</strong>
+  <%= @tournament.randomized_teams %>
+</p>
 
-  <p>
-    <strong>Status:</strong>
-    <% if @tournament.status == 0 %>
-    	Waiting for players...
-    <% else %>
-    	Started
-    <% end %>
-  </p>
-
-  <p>
-    <strong>Min players per team:</strong>
-    <%= @tournament.min_players_per_team %>
-  </p>
-
-  <p>
-    <strong>Max players per team:</strong>
-    <%= @tournament.max_players_per_team %>
-  </p>
-
-  <p>
-    <strong>Min teams per match:</strong>
-    <%= @tournament.min_teams_per_match %>
-  </p>
-
-  <p>
-    <strong>Max teams per match:</strong>
-    <%= @tournament.max_teams_per_match %>
-  </p>
-
-  <p>
-    <strong>Set rounds:</strong>
-    <%= @tournament.set_rounds %>
-  </p>
-
-  <p>
-    <strong>Randomized teams:</strong>
-    <%= @tournament.randomized_teams %>
-  </p>
 </span>
 
 <div >
@@ -120,7 +120,4 @@ function donehandle( tournament ) {
 
 $.ajax({url: "<%= url_for @tournament %>.json"})
   .done(donehandle);
-
-
-
-</script>
\ No newline at end of file
+</script>
-- 
cgit v1.2.3-2-g168b