diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 17:55:58 -0500 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 17:55:58 -0500 |
| commit | d37bfd1e96f01d6f0fae275924e89dfe17a94938 (patch) | |
| tree | 2b91210dd196a1e1d6fab67e561cba12dc43d8eb /app/views/games/index.html.erb | |
| parent | bc42a479891d491aecd5477cfeedd986e9738438 (diff) | |
| parent | 19b135ec55e040c78009400f389d19ae58cc628c (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/games/index.html.erb')
| -rw-r--r-- | app/views/games/index.html.erb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index 6779307..ac362cd 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -1,6 +1,6 @@ <h1>Listing games</h1> -<table class="table table-hover"> +<table> <thead> <tr> <th>Name</th> @@ -32,4 +32,8 @@ <br> +<<<<<<< HEAD +<%= link_to 'New Game', new_game_path %> +======= <%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %> +>>>>>>> aca85cf084702c29014a17eafb090421061fae8b |