Merge branch 'master' of github.com:heygrady/1KB-SCSS-Grid

heygrady · heygrady · commit dbf061e0018d · 2012-04-27T15:50:50.000-07:00
Conflicts:
	.gitignore
	README.md
	example/scss/fixed.scss
	example/scss/fluid.scss
	lib/compass-grid.rb
	lib/compass/grid/version.rb
	stylesheets/grid/_fluid.scss
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
 This repository has moved to [compass-grid-plugin](https://github.com/heygrady/compass-grid-plugin).
 
-This repository is being left here to prevent dead links. Please update your links and inform anyone linking to this page to update theirs.
+This repository is being left here to prevent dead links. Please update your links and inform anyone linking to this page to update theirs.

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`This repository has moved to [compass-grid-plugin](https://github.com/heygrady/compass-grid-plugin).`
`2`	`2`
`3`		`-This repository is being left here to prevent dead links. Please update your links and inform anyone linking to this page to update theirs.`
	`3`	`+This repository is being left here to prevent dead links. Please update your links and inform anyone linking to this page to update theirs.`