From 1dfd009575445fd021dd8532f8ef3e5a17e4a594 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Tue, 4 Mar 2014 18:51:09 -0500
Subject: games no longer has conflict

---
 app/views/games/index.html.erb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/views')

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
+
-- 
cgit v1.2.3-54-g00ecf