diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
| commit | 45c5d311492ef98ed702beaf043d289a705a5e0b (patch) | |
| tree | c0bea2e65d21127a1fd34a245b5bb7fc47123bb0 /app/views/teams/show.json.jbuilder | |
| parent | 9d226fcd27b6c2470edf718ad36a262348891470 (diff) | |
| parent | c927cd7c043d982f8ffb51c8a78288d88d825d82 (diff) | |
Merge branch 'clean2'
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/views/teams/show.json.jbuilder')
| -rw-r--r-- | app/views/teams/show.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/teams/show.json.jbuilder b/app/views/teams/show.json.jbuilder index 8a85dcc..1538019 100644 --- a/app/views/teams/show.json.jbuilder +++ b/app/views/teams/show.json.jbuilder @@ -1 +1 @@ -json.extract! @team, :id, :match_id, :created_at, :updated_at +json.extract! @team, :id, :created_at, :updated_at |