Fixed Gemfile.lock file merge conflict

2015-02-26 09:39:48 -05:00
parent 9e7eb02cde
commit bb6ad2bae9
1 changed files with 0 additions and 4 deletions
@@ -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)