From 12d95dde6caee7d26f5b9c850af229740bfbc381 Mon Sep 17 00:00:00 2001
From: Ryan LeCompte <lecompte@gmail.com>
Date: Thu, 9 Feb 2012 22:04:22 -0800
Subject: [PATCH] fix merge conflicts

---
 lib/sidekiq/redis_connection.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/sidekiq/redis_connection.rb b/lib/sidekiq/redis_connection.rb
index 8d221fcf..9950e836 100644
--- a/lib/sidekiq/redis_connection.rb
+++ b/lib/sidekiq/redis_connection.rb
@@ -3,23 +3,11 @@ require 'redis/namespace'
 
 module Sidekiq
   class RedisConnection
-<<<<<<< HEAD
     def self.create(options={})
       url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0'
       client = build_client(url, options[:namespace])
       return ConnectionPool.new { client } if options[:use_pool]
       client
-=======
-    def self.create(url=nil, namespace=nil, pool=true)
-      @namespace = namespace
-      @url = url
-
-      if pool
-        ConnectionPool.new { connect }
-      else
-        connect
-      end
->>>>>>> c2877d690fac59ee18006912aeecd3babb072dc1
     end
 
     def self.build_client(url, namespace)