From 0e66ec82afa9acb476ce6bfa2261e95008e81958 Mon Sep 17 00:00:00 2001
From: Krzysztof Zylawy <krzysztof@mintdigital.com>
Date: Tue, 21 Oct 2008 13:19:50 +0100
Subject: [PATCH] removed conflict accidentally checked in

---
 lib/webrat/merb.rb | 55 ++--------------------------------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

diff --git a/lib/webrat/merb.rb b/lib/webrat/merb.rb
index eab0e1c..ac65ee9 100644
--- a/lib/webrat/merb.rb
+++ b/lib/webrat/merb.rb
@@ -5,25 +5,6 @@ module Webrat
     attr_reader :response
     
     def get(url, data, headers = nil)
-<<<<<<< HEAD:lib/webrat/merb.rb
-      @response = request(url, :params => data, :headers => headers, :method => "GET")
-    end
-  
-    def post(url, data, headers = nil)
-      @response = request(url, :params => data, :headers => headers, :method => "POST")
-    end
-  
-    def put(url, data, headers = nil)
-      @response = request(url, :params => data, :headers => headers, :method => "PUT")
-    end
-  
-    def delete(url, data, headers = nil)
-     @response = request(url, :params => data, :headers => headers, :method => "DELETE")
-    end
-    
-    def response_body
-      @response.body
-=======
       do_request(url, data, headers, "GET")
     end
   
@@ -41,22 +22,14 @@ module Webrat
     
     def response_body
       @response.body.to_s
->>>>>>> 86879c13c05ad0448456575f148495bf700e1d4c:lib/webrat/merb.rb
     end
-    
-    def response_code
-      @response.status
-    end
-    
-<<<<<<< HEAD:lib/webrat/merb.rb
-=======
+ 
     protected
     def do_request(url, data, headers, method)
       @response = request(url, :params => data, :headers => headers, :method => method)
       self.get(@response.headers['Location'], nil, @response.headers) if @response.status == 302
     end
-    
->>>>>>> 86879c13c05ad0448456575f148495bf700e1d4c:lib/webrat/merb.rb
+
   end
 end
 
@@ -65,27 +38,3 @@ class Merb::Test::RspecStory
     @browser ||= Webrat::Session.new
   end
 end
-
-<<<<<<< HEAD:lib/webrat/merb.rb
-
-# 
-# class Application < Merb::Controller
-#   def cookies=(newcookies)
-#     @_cookies = newcookies
-#   end
-# end
-# 
-# 
-# #Other utilities used by Webrat that are present in Rails but not Merb. We can require heavy dependencies
-# #here because we're only loaded in Test mode. 
-# require 'strscan'
-# require 'cgi'
-require File.join(File.dirname(__FILE__), "merb", "param_parser.rb")
-require File.join(File.dirname(__FILE__), "merb", "url_encoded_pair_parser.rb")
-# require File.join(File.dirname(__FILE__), "merb", "indifferent_access.rb")
-# require File.join(File.dirname(__FILE__), "merb", "support.rb")
-# 
-# 
-# 
-=======
->>>>>>> 86879c13c05ad0448456575f148495bf700e1d4c:lib/webrat/merb.rb