From bb6ad2bae9975c5e328de3afc6283334a44c987c Mon Sep 17 00:00:00 2001
From: Al Snow <jasnow@hotmail.com>
Date: Thu, 26 Feb 2015 09:39:48 -0500
Subject: [PATCH] Fixed Gemfile.lock file merge conflict

---
 Gemfile.lock | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b5686d0..6f5a8c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,12 +70,8 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-<<<<<<< HEAD
-    coffee-script-source (1.9.0)
-=======
     coffee-script-source (1.8.0)
     crack (0.3.1)
->>>>>>> b2c8e6cf8dbbaf33b548b62aba99aa9512322da9
     cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)