Fixed a bad merge

Author: Zuhaib Siddique

lib/ldclient-rb/config.rb

@@ -145,10 +145,7 @@ def offline?
     #
     attr_reader :feature_store
 
-<<<<<<< HEAD
-=======
 
->>>>>>> ba355ed1fc08c6162e2335f60480c0d658b04964
     # The proxy configuration string
     #
     attr_reader :proxy

lib/ldclient-rb/stream.rb

@@ -27,22 +27,13 @@ def start
       return unless @started.make_true
 
       @config.logger.info("[LDClient] Initializing stream connection")
-<<<<<<< HEAD
-      headers =
-        {
-          "Authorization" => @sdk_key,
-          "User-Agent" => "RubyClient/" + LaunchDarkly::VERSION
-        }
-      opts = { headers: headers, with_credentials: true, proxy: @config.proxy }
-=======
 
       headers = 
       {
         'Authorization' => @sdk_key,
         'User-Agent' => 'RubyClient/' + LaunchDarkly::VERSION
       }
       opts = {:headers => headers, :with_credentials => true, :proxy => @config.proxy}
->>>>>>> ba355ed1fc08c6162e2335f60480c0d658b04964
       @es = Celluloid::EventSource.new(@config.stream_uri + "/flags", opts) do |conn|
         conn.on(PUT) { |message| process_message(message, PUT) }
         conn.on(PATCH) { |message| process_message(message, PATCH) }

spec/requestor_spec.rb

@@ -8,25 +8,16 @@
         LaunchDarkly::Requestor.new(
           "key",
           LaunchDarkly::Config.new({
-<<<<<<< HEAD
-            proxy: "http://proxy.com",
-            base_uri: "http://ld.com"
-=======
             :proxy => "http://proxy.com",
             :base_uri => "http://ld.com"
->>>>>>> ba355ed1fc08c6162e2335f60480c0d658b04964
           })
         )
       }
       it "converts the proxy option" do
         faraday = Faraday.new
         requestor.instance_variable_set(:@client, faraday)
         allow(faraday).to receive(:get) do |*args, &block|
-<<<<<<< HEAD
-          req = double(Faraday::Request, headers: {}, options: Faraday::RequestOptions.new)
-=======
           req = double(Faraday::Request, :headers => {}, :options => Faraday::RequestOptions.new)
->>>>>>> ba355ed1fc08c6162e2335f60480c0d658b04964
           block.call(req)
           expect(args).to eq ['http://ld.com/sdk/latest-flags']
           expect(req.options.proxy[:uri]).to eq URI("http://proxy.com")
@@ -41,23 +32,15 @@
         LaunchDarkly::Requestor.new(
           "key",
           LaunchDarkly::Config.new({
-<<<<<<< HEAD
-            base_uri: "http://ld.com"
-=======
             :base_uri => "http://ld.com"
->>>>>>> ba355ed1fc08c6162e2335f60480c0d658b04964
           })
         )
       }
       it "converts the proxy option" do
         faraday = Faraday.new
         requestor.instance_variable_set(:@client, faraday)
         allow(faraday).to receive(:get) do |*args, &block|
-<<<<<<< HEAD
-          req = double(Faraday::Request, headers: {}, options: Faraday::RequestOptions.new)
-=======
           req = double(Faraday::Request, :headers => {}, :options => Faraday::RequestOptions.new)
->>>>>>> ba355ed1fc08c6162e2335f60480c0d658b04964
           block.call(req)
           expect(args).to eq ['http://ld.com/sdk/latest-flags']
           expect(req.options.proxy).to eq nil