diff options
| -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 + |