fix conflict
No related branches found
No related tags found
Showing
- docs/content/tools/cluster.rst 1 addition, 1 deletiondocs/content/tools/cluster.rst
- src/fastaFromBed/fastaFromBed.cpp 5 additions, 4 deletionssrc/fastaFromBed/fastaFromBed.cpp
- src/fastaFromBed/fastaFromBed.h 2 additions, 1 deletionsrc/fastaFromBed/fastaFromBed.h
- src/fastaFromBed/fastaFromBedMain.cpp 8 additions, 1 deletionsrc/fastaFromBed/fastaFromBedMain.cpp
- src/intersectFile/intersectFile.cpp 5 additions, 2 deletionssrc/intersectFile/intersectFile.cpp
- src/nucBed/nucBed.cpp 10 additions, 9 deletionssrc/nucBed/nucBed.cpp
- src/nucBed/nucBed.h 2 additions, 1 deletionsrc/nucBed/nucBed.h
- src/nucBed/nucBedMain.cpp 18 additions, 9 deletionssrc/nucBed/nucBedMain.cpp
- src/utils/Fasta/Fasta.cpp 23 additions, 14 deletionssrc/utils/Fasta/Fasta.cpp
- src/utils/Fasta/Fasta.h 9 additions, 4 deletionssrc/utils/Fasta/Fasta.h
- src/utils/FileRecordTools/FileRecordMgr.cpp 4 additions, 2 deletionssrc/utils/FileRecordTools/FileRecordMgr.cpp
- src/utils/FileRecordTools/RecordOutputMgr.cpp 27 additions, 26 deletionssrc/utils/FileRecordTools/RecordOutputMgr.cpp
- src/utils/FileRecordTools/RecordOutputMgr.h 9 additions, 4 deletionssrc/utils/FileRecordTools/RecordOutputMgr.h
- src/utils/FileRecordTools/Records/BlockMgr.cpp 9 additions, 2 deletionssrc/utils/FileRecordTools/Records/BlockMgr.cpp
- src/utils/FileRecordTools/Records/BlockMgr.h 3 additions, 0 deletionssrc/utils/FileRecordTools/Records/BlockMgr.h
- src/utils/FileRecordTools/Records/Record.cpp 5 additions, 10 deletionssrc/utils/FileRecordTools/Records/Record.cpp
- src/utils/FileRecordTools/Records/recordsTar.tar.gz 0 additions, 0 deletionssrc/utils/FileRecordTools/Records/recordsTar.tar.gz
- test/getfasta/t_fH.fa 6 additions, 0 deletionstest/getfasta/t_fH.fa
- test/getfasta/t_fH.fa.fai 1 addition, 0 deletionstest/getfasta/t_fH.fa.fai
- test/getfasta/test-getfasta.sh 9 additions, 0 deletionstest/getfasta/test-getfasta.sh
Loading
Please register or sign in to comment