diff options
| author | Brandon Mathis <brandon@imathis.com> | 2011-09-08 10:39:49 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2011-09-08 10:39:49 -0500 |
| commit | 7e75d2f65490c43e4ae0ef97c1cf6fedac4b76c6 (patch) | |
| tree | d33a16588de5c1034c4359213b38a3a95d777fb2 /Gemfile.lock | |
| parent | 71ad7185bc10b1fda8983fa73d195adb37654639 (diff) | |
| download | my_new_personal_website-7e75d2f65490c43e4ae0ef97c1cf6fedac4b76c6.tar.xz my_new_personal_website-7e75d2f65490c43e4ae0ef97c1cf6fedac4b76c6.zip | |
updated Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 74bca9cb..0ae80bc7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,14 +39,10 @@ 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) |