Download as
Browse Code »

Commit 7941f68446b09fe59a33b651fc74954a4f7d5b60

Authored by Leandro Santos
2 parents 2ac0a19b 190120b4
Exists in master

fixing conflit

Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
script/sent_event_report
  Diff comments   View file @7941f68
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # encoding: UTF-8 2 # encoding: UTF-8
3 include ActionDispatch::TestProcess 3 include ActionDispatch::TestProcess
4 4
5 -puts 'Iniciando script eventos' 5 +puts 'Iniciando script'
6 6
7 filebasepath = '/tmp/' 7 filebasepath = '/tmp/'
8 8
script/sent_proposal_report
  Diff comments   View file @7941f68
@@ -49,5 +49,8 @@ end @@ -49,5 +49,8 @@ end
49 49
50 file.close 50 file.close
51 51
  52 +<<<<<<< HEAD
52 uploaded_file = UploadedFile.new(:uploaded_data => fixture_file_upload(filepath, 'text/csv'), :profile => dialoga, :parent => report_folder) 53 uploaded_file = UploadedFile.new(:uploaded_data => fixture_file_upload(filepath, 'text/csv'), :profile => dialoga, :parent => report_folder)
53 uploaded_file.save 54 uploaded_file.save
  55 +=======
  56 +>>>>>>> 190120b4af270bd5d767faf5253c488e216f11b8