diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f2fc737d..74bca9cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,9 +39,17 @@ GEM rubypython (0.5.1) blankslate (>= 2.1.2.3) ffi (~> 1.0.7) +<<<<<<< HEAD sass (3.1.7) +======= + sass (3.1.5) + sinatra (1.2.6) + rack (~> 1.1) + tilt (>= 1.2.2, < 2.0) +>>>>>>> 423e8ecbda0394d4c77e2ea659768a8f30c35018 stringex (1.3.0) syntax (1.0.0) + tilt (1.3.2) PLATFORMS ruby @@ -57,4 +65,5 @@ DEPENDENCIES rb-fsevent rdiscount rubypants + sinatra (= 1.2.6) stringex |