Browse code

Upgraded to GC 7.6.12 + corresponding changes in package

UBod authored on 15/10/2021 12:17:47
Showing1 changed files

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