From f3b48953d0778d8d4d8bbc668228d397dc3d0fc1 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Mon, 13 Jul 2015 20:37:13 -0300
Subject: [PATCH] removing merge conflit

---
 lib/noosfero/api/helpers.rb | 4 ----
 1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/lib/noosfero/api/helpers.rb b/lib/noosfero/api/helpers.rb
index 5799469..ed64c0f 100644
--- a/lib/noosfero/api/helpers.rb
+++ b/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
 
--
libgit2 0.21.2