diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 17:57:24 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 17:57:24 -0500 |
| commit | c6ba6c11c7f0665064efdfc9385a5b8e1deaee50 (patch) | |
| tree | 6c48690a8873b8e3f3aeb0fadd137801cb548994 /app/views/games | |
| parent | 134360da46c1f8e5153c1c9eb5180ac990150d93 (diff) | |
| parent | d37bfd1e96f01d6f0fae275924e89dfe17a94938 (diff) | |
mergin' the wizard
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/games')
| -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 |