Merge Ruby 1.9 fixes

maccman · Aug 3, 2009 · 0bea7cc · 0bea7cc
1 parent 40703d8
commit 0bea7cc
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/lib/juggernaut.rb b/lib/juggernaut.rb
@@ -184,31 +184,17 @@ def render_for_juggernaut(data, options = {})
             when :send_to_clients
               juggernaut_needs options, :client_ids
               Juggernaut.send_to_clients(data, options[:client_ids])
-<<<<<<< HEAD:lib/juggernaut.rb
-            when :send_to_client_on_channel:
+            when :send_to_client_on_channel
               juggernaut_needs options, :client_id, :channel
               Juggernaut.send_to_clients_on_channel(data, options[:client_id], options[:channel])
-            when :send_to_clients_on_channel:
-              juggernaut_needs options, :client_ids, :channel
-              Juggernaut.send_to_clients_on_channel(data, options[:client_ids], options[:channel])
-            when :send_to_client_on_channels:
-              juggernaut_needs options, :client_ids, :channels
-              Juggernaut.send_to_clients_on_channel(data, options[:client_id], options[:channels])
-            when :send_to_clients_on_channels:
-              juggernaut_needs options, :client_ids, :channels
-=======
-            when :send_to_client_on_channel
-              juggernaut_needs options, :client_id, :channels
-              Juggernaut.send_to_clients_on_channel(data, options[:client_id], options[:channels])
             when :send_to_clients_on_channel
               juggernaut_needs options, :client_ids, :channel
               Juggernaut.send_to_clients_on_channel(data, options[:client_ids], options[:channel])
             when :send_to_client_on_channels
-              juggernaut_needs options, :client_ids, :channel
+              juggernaut_needs options, :client_ids, :channels
               Juggernaut.send_to_clients_on_channel(data, options[:client_id], options[:channels])
             when :send_to_clients_on_channels
-              juggernaut_needs options, :client_ids, :channel
->>>>>>> aa44ad35759661d751c7db114fccb85fadb71514:lib/juggernaut.rb
+              juggernaut_needs options, :client_ids, :channels
               Juggernaut.send_to_clients_on_channel(data, options[:client_ids], options[:channels])
           end
         end