diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 18:51:09 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 18:51:09 -0500 |
| commit | 1dfd009575445fd021dd8532f8ef3e5a17e4a594 (patch) | |
| tree | e0ba0a285c9fb5dbb110cd4db930976811b7e1b2 /app/views | |
| parent | 0329e2cee29367c82ef1b4ea5e8ab700f5d82bea (diff) | |
games no longer has conflict
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/games/index.html.erb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index ac362cd..7ee69d1 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -32,8 +32,6 @@ <br> -<<<<<<< HEAD -<%= link_to 'New Game', new_game_path %> -======= + <%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %> ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b + |