| ... | ... |
@@ -2,11 +2,7 @@ Package: evaluomeR |
| 2 | 2 |
Type: Package |
| 3 | 3 |
Title: Evaluation of Bioinformatics Metrics |
| 4 | 4 |
URL: http://sele.inf.um.es/evaluome/index.html |
| 5 |
-<<<<<<< HEAD |
|
| 6 |
-Version: 1.0.0 |
|
| 7 |
-======= |
|
| 8 |
-Version: 1.1.3 |
|
| 9 |
->>>>>>> 4d21658... Updating data from Bioconductor devel branch |
|
| 5 |
+Version: 1.0.1 |
|
| 10 | 6 |
Authors@R: c( |
| 11 | 7 |
person("José Antonio", "Bernabé-Díaz", email = "[email protected]", role = c("aut", "cre")),
|
| 12 | 8 |
person("Manuel", "Franco", email = "[email protected]", role = "aut"),
|
| ... | ... |
@@ -41,4 +37,4 @@ Collate: |
| 41 | 37 |
'internalFunctions.R' |
| 42 | 38 |
'stabilityIndex.R' |
| 43 | 39 |
'qualityIndices.R' |
| 44 |
- 'correlation.R' |
|
| 40 |
+ 'correlation.R' |
|
| 45 | 41 |
\ No newline at end of file |
| ... | ... |
@@ -1,12 +1,18 @@ |
| 1 |
-<<<<<<< HEAD |
|
| 2 |
-======= |
|
| 1 |
+Changes in version 1.1.6 (2019-09-25) |
|
| 2 |
+ + Version BUMP |
|
| 3 |
+ |
|
| 4 |
+Changes in version 1.1.5 (2019-09-25) |
|
| 5 |
+ + Version BUMP |
|
| 6 |
+ |
|
| 7 |
+Changes in version 1.1.4 (2019-09-24) |
|
| 8 |
+ + Updating package depencencies |
|
| 9 |
+ |
|
| 3 | 10 |
Changes in version 1.1.3 (2019-09-19) |
| 4 | 11 |
+ Updating data from Bioconductor devel branch |
| 5 | 12 |
|
| 6 | 13 |
Changes in version 1.1.2 (2019-09-11) |
| 7 | 14 |
+ Bug fix. Plot did not work as intended when there was a metric without data |
| 8 | 15 |
|
| 9 |
->>>>>>> 4d21658... Updating data from Bioconductor devel branch |
|
| 10 | 16 |
Changes in version 0.99.81 (2019-02-26) |
| 11 | 17 |
+ Updated DESCRIPTION metadata |
| 12 | 18 |
|
