Mic92/blog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated Gemfile.lock

Browse Source
This commit is contained in:
Brandon Mathis 2011-09-08 10:39:49 -05:00
parent 71ad7185bc
commit 7e75d2f654
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@ -39,14 +39,10 @@ GEM
rubypython (0.5.1) rubypython (0.5.1)
blankslate (>= 2.1.2.3) blankslate (>= 2.1.2.3)
ffi (~> 1.0.7) ffi (~> 1.0.7)
<<<<<<< HEAD
sass (3.1.7)
=======
sass (3.1.5) sass (3.1.5)
sinatra (1.2.6) sinatra (1.2.6)
rack (~> 1.1) rack (~> 1.1)
tilt (>= 1.2.2, < 2.0) tilt (>= 1.2.2, < 2.0)
>>>>>>> 423e8ecbda0394d4c77e2ea659768a8f30c35018
stringex (1.3.0) stringex (1.3.0)
syntax (1.0.0) syntax (1.0.0)
tilt (1.3.2) tilt (1.3.2)