Browse code

v1.3.1: merge conflict

Peter Blattmann authored on 22/02/2019 14:05:14
Showing 2 changed files

... ...
@@ -1,7 +1,7 @@
1 1
 Package: DominoEffect
2 2
 Type: Package
3 3
 Title: Identification and Annotation of Protein Hotspot Residues
4
-Version: 1.1.3
4
+Version: 1.3.1
5 5
 Author: Marija Buljan and Peter Blattmann
6 6
 Maintainer: Marija Buljan <[email protected]>, 
7 7
     Peter Blattmann <[email protected]>
... ...
@@ -1,9 +1,24 @@
1
-CHANGES IN VERSION 1.1.2
1
+CHANGES IN VERSION 1.3.1
2 2
 -------------------------
3 3
 UDPATE
4 4
 
5 5
  o change Ensembl version from 73 to 75
6 6
 
7
+
8
+CHANGES IN VERSION 1.3.0
9
+-------------------------
10
+NEW FEATURES
11
+
12
+ o DominoEffect in BioC 3.8 development release
13
+
14
+
15
+CHANGES IN VERSION 1.2.0
16
+-------------------------
17
+NEW FEATURES
18
+
19
+ o DominoEffect in BioC 3.8 release
20
+
21
+
7 22
 CHANGES IN VERSION 1.1.2
8 23
 -------------------------
9 24
 BUG FIX