team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Gemfile.lock file merge conflict

Browse Source
This commit is contained in:
Al Snow
2015-02-26 09:39:48 -05:00
parent 9e7eb02cde
commit bb6ad2bae9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
-4
View File
@@ -70,12 +70,8 @@ GEM
coffee-script (2.3.0) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
<<<<<<< HEAD
coffee-script-source (1.9.0)
=======
coffee-script-source (1.8.0) coffee-script-source (1.8.0)
crack (0.3.1) crack (0.3.1)
>>>>>>> b2c8e6cf8dbbaf33b548b62aba99aa9512322da9
cucumber (1.3.15) cucumber (1.3.15)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.3) diff-lcs (>= 1.1.3)