diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
| commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
| tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /app/views/games/show.json.jbuilder | |
| parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
| parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'app/views/games/show.json.jbuilder')
| -rw-r--r-- | app/views/games/show.json.jbuilder | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder deleted file mode 100644 index 1a2d0c7..0000000 --- a/app/views/games/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.extract! @game, :id, :name, :players_per_team, :teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at |