| ... | ... |
@@ -2,7 +2,11 @@ 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 |
-Version: 1.1.6 |
|
| 5 |
+<<<<<<< HEAD |
|
| 6 |
+Version: 1.0.0 |
|
| 7 |
+======= |
|
| 8 |
+Version: 1.1.3 |
|
| 9 |
+>>>>>>> 4d21658... Updating data from Bioconductor devel branch |
|
| 6 | 10 |
Authors@R: c( |
| 7 | 11 |
person("José Antonio", "Bernabé-Díaz", email = "[email protected]", role = c("aut", "cre")),
|
| 8 | 12 |
person("Manuel", "Franco", email = "[email protected]", role = "aut"),
|
| ... | ... |
@@ -1,18 +1,12 @@ |
| 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 |
- |
|
| 1 |
+<<<<<<< HEAD |
|
| 2 |
+======= |
|
| 10 | 3 |
Changes in version 1.1.3 (2019-09-19) |
| 11 | 4 |
+ Updating data from Bioconductor devel branch |
| 12 | 5 |
|
| 13 | 6 |
Changes in version 1.1.2 (2019-09-11) |
| 14 | 7 |
+ Bug fix. Plot did not work as intended when there was a metric without data |
| 15 | 8 |
|
| 9 |
+>>>>>>> 4d21658... Updating data from Bioconductor devel branch |
|
| 16 | 10 |
Changes in version 0.99.81 (2019-02-26) |
| 17 | 11 |
+ Updated DESCRIPTION metadata |
| 18 | 12 |
|
