git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/StarBioTrek@130107 bc3139a8-67e5-0310-9ffc-ced21a209358
Claudia Cava authored on 05/06/2017 07:18:58
| ... | ... |
@@ -1,13 +1,8 @@ |
| 1 | 1 |
Package: StarBioTrek |
| 2 | 2 |
Type: Package |
| 3 | 3 |
Title: StarBioTrek |
| 4 |
-<<<<<<< .mine |
|
| 5 |
-Version: 1.2.1 |
|
| 6 |
-Date: 05-12-2017 |
|
| 7 |
-======= |
|
| 8 |
-Version: 1.3.0 |
|
| 9 |
-Date: 02-08-2017 |
|
| 10 |
->>>>>>> .r129550 |
|
| 4 |
+Version: 1.3.1 |
|
| 5 |
+Date: 06-05-2017 |
|
| 11 | 6 |
Author: Claudia Cava, |
| 12 | 7 |
Isabella Castiglioni |
| 13 | 8 |
Maintainer: Claudia Cava <claudia.cava@ibfm.cnr.it> |