From a10d907deb3785159ec0451dde0b1438df6a383b Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Fri, 14 Aug 2015 17:37:48 -0300
Subject: [PATCH] fix conflit

---
 script/sent_proposal_report | 3 ---
 1 file changed, 0 insertions(+), 3 deletions(-)

diff --git a/script/sent_proposal_report b/script/sent_proposal_report
index 7cec7a8..4ece0a2 100755
--- a/script/sent_proposal_report
+++ b/script/sent_proposal_report
@@ -49,8 +49,5 @@ end
 
 file.close
 
-<<<<<<< HEAD
 uploaded_file = UploadedFile.new(:uploaded_data => fixture_file_upload(filepath, 'text/csv'), :profile => dialoga, :parent => report_folder)
 uploaded_file.save
-=======
->>>>>>> 190120b4af270bd5d767faf5253c488e216f11b8
--
libgit2 0.21.2