diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
| commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
| tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /app/views/tournaments/index.html.erb | |
| parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
| parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) | |
Settled Merge Conflicts.
Diffstat (limited to 'app/views/tournaments/index.html.erb')
| -rw-r--r-- | app/views/tournaments/index.html.erb | 1 |
1 files changed, 0 insertions, 1 deletions
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> |