From 503bde5d249374a35ea9296ba707af66b03451db Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Wed, 12 Feb 2014 22:09:34 +1100 Subject: [PATCH 1/2] Merge Sass and Compass templates --- Global/SASS.gitignore | 2 -- Compass.gitignore => Sass.gitignore | 0 2 files changed, 2 deletions(-) delete mode 100644 Global/SASS.gitignore rename Compass.gitignore => Sass.gitignore (100%) diff --git a/Global/SASS.gitignore b/Global/SASS.gitignore deleted file mode 100644 index c1df001e..00000000 --- a/Global/SASS.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -### Sass Ignores - "Sassy CSS" http://sass-lang.com/ -*.sass-cache diff --git a/Compass.gitignore b/Sass.gitignore similarity index 100% rename from Compass.gitignore rename to Sass.gitignore From 553033ff2f89c1fcb4cad90dfef15c614ca7324f Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Wed, 12 Feb 2014 22:09:54 +1100 Subject: [PATCH 2/2] Remove old sass-cache rule for Rails --- Rails.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/Rails.gitignore b/Rails.gitignore index 56454403..1a2c94dc 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -1,6 +1,4 @@ *.rbc -*.sassc -.sass-cache capybara-*.html .rspec /log