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/show.json.jbuilder | |
parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) |
Settled Merge Conflicts.
Diffstat (limited to 'app/views/tournaments/show.json.jbuilder')
-rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
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 |