Browse code

Upgraded to GC 7.6.12 + corresponding changes in package

UBod authored on 15/10/2021 12:35:07
Showing1 changed files

... ...
@@ -1,13 +1,8 @@
1 1
 Package: msa
2 2
 Type: Package
3 3
 Title: Multiple Sequence Alignment
4
-<<<<<<< HEAD
5 4
 Version: 1.25.1
6 5
 Date: 2021-10-14
7
-=======
8
-Version: 1.25.0
9
-Date: 2021-04-29
10
->>>>>>> upstream/master
11 6
 Author: Enrico Bonatesta, Christoph Horejs-Kainrath, Ulrich Bodenhofer
12 7
 Maintainer: Ulrich Bodenhofer <bodenhofer@bioinf.jku.at>
13 8
 Description: The 'msa' package provides a unified R/Bioconductor interface to