@@ -33,7 +33,8 @@ module GrowlAtom cache_dir = File.join(config_dir, 'caches') config['feeds'].each {|feed| - options = default_options.merge(config['global']).merge(feed) + options = feed + options = default_options.merge(config['global']).merge(feed) if config['global'] self.parse_feed(self.get_feed(options), options, cache_dir) } lib/growl-atom.rb 9331027041ca840daf69af361fbb5cee937ae4f0 matth matt@matthaynes.net http://github.com/matth/growl-atom/commit/6b6985d3da6188e6a6e35aedee082085017ff40f 6b6985d3da6188e6a6e35aedee082085017ff40f 2009-10-18T11:10:05-07:00 2009-10-18T11:10:05-07:00 Make global options optional c4d164fe11cd3b892559c5d580515c1a155ab105 matth matt@matthaynes.net