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/matches/index.json.jbuilder | |
| parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
| parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) | |
Settled Merge Conflicts.
Diffstat (limited to 'app/views/matches/index.json.jbuilder')
| -rw-r--r-- | app/views/matches/index.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index 1a63f5f..18f172d 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :status, :tournament_id, :name, :winner_id + json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id json.url match_url(match, format: :json) end |