| ... | ... |
@@ -2,7 +2,11 @@ Package: KEGGlincs |
| 2 | 2 |
Type: Package |
| 3 | 3 |
Title: Visualize all edges within a KEGG pathway and overlay LINCS data |
| 4 | 4 |
[option] |
| 5 |
+<<<<<<< HEAD |
|
| 5 | 6 |
Version: 1.5.1 |
| 7 |
+======= |
|
| 8 |
+Version: 1.7.1 |
|
| 9 |
+>>>>>>> upstream/master |
|
| 6 | 10 |
Date: 2016-06-02 |
| 7 | 11 |
Author: Shana White |
| 8 | 12 |
Maintainer: Shana White <vandersm@mail.uc.edu>, Mario Medvedovic <medvedm@ucmail.uc.edu> |
