Fix merge conflict

This commit is contained in:
jina 2015-06-05 15:11:10 -07:00
parent cbdc2af0aa
commit 9aa838803f

View File

@ -21,7 +21,8 @@ title: libSass
%ul.slides
%li#sassc
:markdown
### SassC
### Sass C
SassC (get it?) is an wrapper written in C.
To run the compiler on your local machine, you need to build SassC. To build SassC, you must have either a local copy of the libSass source or it must be installed into your system. For development, please use the source version. You must then setup an environment variable pointing to the LibSass folder, for example:
@ -36,7 +37,11 @@ title: libSass
%li#go
:markdown
### Go
The [gosass](https://github.com/moovweb/gosass) project is updated fairly regularly. There are also two other projects: [go-sass](https://github.com/SamWhited/go-sass) and [go_sass](https://github.com/suapapa/go_sass) which have not been updated in a while.
[Wellington](https://github.com/wellington/wellington) is an extension to libsass that adds spriting and is available on brew:
`brew install wellington`
There are also three other libsass wrappers in go: [gosass](https://github.com/moovweb/gosass), [go-sass](https://github.com/SamWhited/go-sass) and [go_sass](https://github.com/suapapa/go_sass) which have not been updated in a while.
%li#java
:markdown