diff test-data/TEST_1/TEST_1.log @ 5:44fb905481f0 draft

planemo upload for repository https://github.com/galaxyproject/tools-iuc/blob/master/tools/bakta commit a7dcdae8bccb5a8d7abdb9c6d058f9bd7c6f6c15
author pimarin
date Thu, 12 Jan 2023 11:25:17 +0000
parents eea334d9988b
children 8c7499c6f32a
line wrap: on
line diff
--- a/test-data/TEST_1/TEST_1.log	Thu Dec 22 15:06:32 2022 +0000
+++ b/test-data/TEST_1/TEST_1.log	Thu Jan 12 11:25:17 2023 +0000
@@ -79,11 +79,7 @@
 	oriCs/oriVs: 0
 	oriTs: 0
 
-<<<<<<< HEAD
-export annotation results to: /tmp/tmptbkng6kx/job_working_directory/000/2/working
-=======
-export annotation results to: /tmp/tmp4jorszj6/job_working_directory/000/2/working
->>>>>>> 195c8410c (change option for plot)
+export annotation results to: /tmp/tmpevwtlk9g/job_working_directory/000/2/working
 	human readable TSV...
 	GFF3...
 	INSDC GenBank & EMBL...