removing merge conflit

Leandro Santos
1 parent d1300777
Showing 1 changed file with 0 additions and 4 deletions Show diff stats
lib/noosfero/api/helpers.rb
@@ -390,9 +390,6 @@
         request = Net::HTTP::Post.new(uri.path)
         verify_string = "#{client_id}&#{token}&#{captcha_text}"
         request.body = verify_string
-<<<<<<< HEAD
-        body = http.request(request).body
-=======
         begin
           body = http.request(request).body
         rescue Exception => e
@@ -401,7 +398,6 @@
         end
         return _("Wrong captcha text, please try again") if body == 0
         return _("Token not found") if body == 2
->>>>>>> serpro_api
         body == '1' ? true : body
       end
...	...	@@ -390,9 +390,6 @@
390	390	request = Net::HTTP::Post.new(uri.path)
391	391	verify_string = "#{client_id}&#{token}&#{captcha_text}"
392	392	request.body = verify_string
393		-<<<<<<< HEAD
394		- body = http.request(request).body
395		-=======
396	393	begin
397	394	body = http.request(request).body
398	395	rescue Exception => e
...	...	@@ -401,7 +398,6 @@
401	398	end
402	399	return _("Wrong captcha text, please try again") if body == 0
403	400	return _("Token not found") if body == 2
404		->>>>>>> serpro_api
405	401	body == '1' ? true : body
406	402	end
407	403
...	...