Permalink
Browse files

Preliminary README edits

  • Loading branch information...
1 parent 309200d commit c7515e50a1c6be996e8bd06a4b3613ab3a655884 Joel Oliveira committed with Reda Lemeden Aug 31, 2012
Showing with 13 additions and 0 deletions.
  1. +13 −0 README.md
View
@@ -12,7 +12,20 @@ Requirements:
- Sass 3.2+
- Bourbon 2.1+
+<<<<<<< HEAD
Put the `/neat` folder in your Sass directory and import it right below Bourbon in your stylesheets:
+=======
+
+Gemfile contents:
+
+ gem 'bourbon'
+ gem 'neat', :git => "git://github.com/thoughtbot/neat.git", :branch => "jro-gemify-neat"
+
+After running `bundle install` you will be able to use bourbon and neat together. Within your application.css.scss file place the following:
+
+ @import "bourbon";
+ @import "neat";
+>>>>>>> Preliminary README edits
```scss
@import "bourbon/bourbon";

0 comments on commit c7515e5

Please sign in to comment.