fixing conflit

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