fix conflicts

examples/simple/word_count_bolt.rb

@@ -11,7 +11,6 @@ class WordCountBolt < RedStorm::SimpleBolt
   end
 end
 
-
 # below is the same bolt but passing a method name to on_tuple
 
 # class WordCountBolt < RedStorm::SimpleBolt

lib/red_storm/simple_bolt.rb

@@ -78,7 +78,5 @@ module RedStorm
     def self.anchor?
       !!self.execute_options[:anchor]
     end
-
   end
-
 end

lib/red_storm/simple_spout.rb

@@ -112,5 +112,4 @@ module RedStorm
       !!self.execute_options[:emit]
     end
   end
-
 end