Browse code
updated Gemfile.lock
Brandon Mathis authored on 08/09/2011 at 15:39:49Showing 1 changed files
| ... | ... |
@@ -39,14 +39,10 @@ GEM |
| 39 | 39 |
rubypython (0.5.1) |
| 40 | 40 |
blankslate (>= 2.1.2.3) |
| 41 | 41 |
ffi (~> 1.0.7) |
| 42 |
-<<<<<<< HEAD |
|
| 43 |
- sass (3.1.7) |
|
| 44 |
-======= |
|
| 45 | 42 |
sass (3.1.5) |
| 46 | 43 |
sinatra (1.2.6) |
| 47 | 44 |
rack (~> 1.1) |
| 48 | 45 |
tilt (>= 1.2.2, < 2.0) |
| 49 |
->>>>>>> 423e8ecbda0394d4c77e2ea659768a8f30c35018 |
|
| 50 | 46 |
stringex (1.3.0) |
| 51 | 47 |
syntax (1.0.0) |
| 52 | 48 |
tilt (1.3.2) |