Resolve merge Conflict

CHANGELOG.md

@@ -3,10 +3,17 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+
+## [publish_1.0.6 ] - 2019-05-31
 ### Added
 - MIT LICENSE
 - Fix references.md link in citation of README.md
 - Add Nextflow to references.md
+- Check for correct genome input
+- Check for correct output for motif serach
+
+### Fixed
+- Path to reference fasta file
 
 ## [publish_1.0.5 ] - 2019-05-16
 ### Fixed

LICENSE.md

@@ -4,7 +4,7 @@ Copyright (c) 2019, University of Texas Southwestern Medical Center.
 
 All rights reserved.
 
-Contributors: Spencer D. Barnes, Holly Ruess, Beibei Chen, Venkat S. Malladi
+Contributors: Spencer D. Barnes, Holly Ruess, Jeremy A. Mathews, Beibei Chen, Venkat S. Malladi
 
 Department: Bioinformatic Core Facility, Department of Bioinformatics
 

README.md

 # **CHIPseq Manual**
-## Version 1.0.5
-## May 16, 2019
+## Version 1.0.6
+## May 31, 2019
 
 # BICF ChIP-seq Pipeline
 

docs/references.md

@@ -52,7 +52,7 @@
   * Ewels P., Magnusson M., Lundin S. and Käller M. 2016. MultiQC: Summarize analysis results for multiple tools and samples in a single report. Bioinformatics 32(19): 3047–3048. doi:[10.1093/bioinformatics/btw354](https://dx.doi.org/10.1093/bioinformatics/btw354)
 
 17. **BICF ChIP-seq Analysis Workflow**:
-  * Spencer D. Barnes, Holly Ruess, Beibei Chen, & Venkat S. Malladi. (2019). BICF ChIP-seq Analysis Workflow (publish_1.0.5). Zenodo. doi:[10.5281/zenodo.2648844](https://doi.org/10.5281/zenodo.2648844)
+  * Spencer D. Barnes, Holly Ruess, Jeremy A. Mathews, Beibei Chen, & Venkat S. Malladi. (2019). BICF ChIP-seq Analysis Workflow (publish_1.0.5). Zenodo. doi:[10.5281/zenodo.2648844](https://doi.org/10.5281/zenodo.2648844)
 
 18. **Nextflow**:
   * Di Tommaso, P., Chatzou, M., Floden, E. W., Barja, P. P., Palumbo, E., & Notredame, C. (2017). Nextflow enables reproducible computational workflows. Nature biotechnology, 35(4), 316.