diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/common/_error_messages.html.erb | 2 | ||||
| -rw-r--r-- | app/views/games/index.html.erb | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/views/common/_error_messages.html.erb b/app/views/common/_error_messages.html.erb index c9fdd51..731f62c 100644 --- a/app/views/common/_error_messages.html.erb +++ b/app/views/common/_error_messages.html.erb @@ -1,7 +1,7 @@ <%# http://railscasts.com/episodes/211-validations-in-rails-3 %> <% if target.errors.any? %> <div id="errorExplanation"> - <h2><%= pluralize(target.errors.count, "error") %> prohibited this record from being saved:</h2> + <h2><%= pluralize(target.errors.count, "error") %> prohibited this form from being submitted:</h2> <ul> <% target.errors.full_messages.each do |msg| %> <li><%= msg %></li> 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 + |