Skip to content

Commit

Permalink
Look for Merb, not Merb::Plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
wycats committed Oct 30, 2008
1 parent 8a0fc6f commit fc92683
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion merb-haml/lib/merb-haml.rb
@@ -1,5 +1,5 @@
# make sure we're running inside Merb
if defined?(Merb::Plugins)
if defined?(Merb)
require "haml"
require "merb-haml/template"
Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks"))
Expand Down

0 comments on commit fc92683

Please sign in to comment.