lib/octopress/configuration.rb in octopress-3.0.0.alpha6 vs lib/octopress/configuration.rb in octopress-3.0.0.alpha7
- old
+ new
@@ -15,10 +15,9 @@
file = '_octopress.yml'
config = {}
if File.exist? file
config = YAML.safe_load(File.open(file))
end
- #config['jekyll'] = jekyll_config(options)
@config = DEFAULTS.deep_merge(config)
end
def self.jekyll_config(options={})
return @jekyll_config if @jekyll_config