diff README.md @ 2:0d65b71ff8df draft

planemo upload commit 464b391afaa5819bc681452e85bea9d882730eb6
author charles_s_test
date Sun, 12 Nov 2017 02:27:32 -0500
parents 6895de35a263
children 38ad1130d077
line wrap: on
line diff
--- a/README.md	Fri Oct 27 17:47:00 2017 -0400
+++ b/README.md	Sun Nov 12 02:27:32 2017 -0500
@@ -1,16 +1,5 @@
-
-# GalaxySeqSero
-#This Project has been modified by the CFSAN FDA office to work in Galaxy it also has a batch functionality as well add by the Galaxy rapper code.
-
-All below dependencies are the same for Seqsero.
- Add this project to the galaxy tools directory and then added to tool_conf.xml
-
-Adding custom tools to Galaxy
-
-https://galaxyproject.org/admin/tools/add-tool-tutorial/
-
-
-# SeqSero 1.1
+<<<<<<< HEAD
+# SeqSero 1.0
 Salmonella serotyping from genome sequencing data