Merge branch 'master' of https://github.com/sporkd/compass-html5-boil…

…erplate Conflicts: lib/html5-boilerplate.rb
heygrady · Jan 18, 2012 · 34e557b · 34e557b
2 parents 75a9d55 + 72a7989
commit 34e557b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/html5-boilerplate.rb b/lib/html5-boilerplate.rb
@@ -1,5 +1,5 @@
 require 'compass-h5bp'
-Compass::Frameworks.register("html5-boilerplate", :path => "#{File.dirname(__FILE__)}/..")
+Compass::Frameworks.register("html5-boilerplate", :path => "#{File.dirname(__FILE__)}/..") if defined?(Compass)
 
 if defined?(ActionController)
   require File.join(File.dirname(__FILE__), 'app', 'helpers', 'html5_boilerplate_helper')