Fix merge conflicts.
Showing
- workflow/tests/test_annotate_peaks.py 3 additions, 2 deletionsworkflow/tests/test_annotate_peaks.py
- workflow/tests/test_call_peaks_macs.py 8 additions, 8 deletionsworkflow/tests/test_call_peaks_macs.py
- workflow/tests/test_convert_reads.py 4 additions, 4 deletionsworkflow/tests/test_convert_reads.py
- workflow/tests/test_diff_peaks.py 4 additions, 2 deletionsworkflow/tests/test_diff_peaks.py
- workflow/tests/test_experiment_qc.py 18 additions, 8 deletionsworkflow/tests/test_experiment_qc.py
- workflow/tests/test_generate_software_references.py 36 additions, 0 deletionsworkflow/tests/test_generate_software_references.py
- workflow/tests/test_generate_software_versions.py 31 additions, 0 deletionsworkflow/tests/test_generate_software_versions.py
- workflow/tests/test_map_qc.py 11 additions, 11 deletionsworkflow/tests/test_map_qc.py
- workflow/tests/test_map_reads.py 4 additions, 4 deletionsworkflow/tests/test_map_reads.py
- workflow/tests/test_motif_search.py 6 additions, 1 deletionworkflow/tests/test_motif_search.py
- workflow/tests/test_overlap_peaks.py 2 additions, 2 deletionsworkflow/tests/test_overlap_peaks.py
- workflow/tests/test_trim_reads.py 4 additions, 4 deletionsworkflow/tests/test_trim_reads.py
- workflow/tests/test_xcor.py 4 additions, 4 deletionsworkflow/tests/test_xcor.py
Please register or sign in to comment