0
@@ -290,22 +290,7 @@ class MemCache
0
       value = Marshal.dump value unless raw
0
       command = "set #{cache_key} 0 #{expiry} #{value.to_s.size}\r\n#{value}\r\n"
0
 
0
-<<<<<<< HEAD:lib/memcache.rb
0
-      with_socket_management(server) do |socket|
0
-        socket.write command
0
-        result = socket.gets
0
-  			if result.nil?
0
-          server.close
0
-          raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
0
-        end
0
-
0
-  			if result =~ /^SERVER_ERROR (.*)/
0
-          server.close
0
-          raise MemCacheError, $1.strip
0
-  			end
0
-      end
0
-=======
0
-    ActiveRecord::Base.logger.info "Setting key/value #{key}\n#{value}" if value.to_s.size > 800000
0
+      ActiveRecord::Base.logger.info "Setting key/value #{key}\n#{value}" if value.to_s.size > 800000
0
     
0
     begin
0
       @mutex.lock if @multithread
0
@@ -317,7 +302,6 @@ class MemCache
0
       raise MemCacheError, err.message
0
     ensure
0
       @mutex.unlock if @multithread
0
->>>>>>> 1.5.0:lib/memcache.rb
0
     end
0
   end
0
 
0
@@ -335,12 +319,6 @@ class MemCache
0
       value = Marshal.dump value unless raw
0
       command = "add #{cache_key} 0 #{expiry} #{value.size}\r\n#{value}\r\n"
0
 
0
-<<<<<<< HEAD:lib/memcache.rb
0
-      with_socket_management(server) do |socket|
0
-        socket.write command
0
-        socket.gets
0
-      end
0
-=======
0
     ActiveRecord::Base.logger.info "Adding key/value #{key}\n#{value}" if value.to_s.size > 800000
0
 
0
     begin
0
@@ -352,7 +330,6 @@ class MemCache
0
       raise MemCacheError, err.message
0
     ensure
0
       @mutex.unlock if @multithread
0
->>>>>>> 1.5.0:lib/memcache.rb
0
     end
0
   end
0