Download as
Browse Code »

Commit a10d907deb3785159ec0451dde0b1438df6a383b

Authored by Leandro Santos
1 parent 7941f684
Exists in master

fix conflit

Showing 1 changed file with 0 additions and 3 deletions   Show diff stats
script/sent_proposal_report
  Diff comments   View file @a10d907
... ... @@ -49,8 +49,5 @@ end
49 49  
50 50 file.close
51 51  
52   -<<<<<<< HEAD
53 52 uploaded_file = UploadedFile.new(:uploaded_data => fixture_file_upload(filepath, 'text/csv'), :profile => dialoga, :parent => report_folder)
54 53 uploaded_file.save
55   -=======
56   ->>>>>>> 190120b4af270bd5d767faf5253c488e216f11b8
... ...