Merge remote-tracking branch 'upstream/master'
# Conflicts:
# DESCRIPTION
Vlad Petyuk authored on 30/11/2018 18:51:40
| ... | ... |
@@ -3,10 +3,14 @@ Type: Package |
| 3 | 3 |
Title: Utilities for Exploration and Assessment of Confidence of |
| 4 | 4 |
LC-MSn Proteomics Identifications |
| 5 | 5 |
<<<<<<< HEAD |
| 6 |
+<<<<<<< HEAD |
|
| 6 | 7 |
Version: 1.15.2 |
| 7 | 8 |
======= |
| 8 | 9 |
Version: 1.16.0 |
| 9 | 10 |
>>>>>>> 1a3f00a194cf047b86d00cde2325f37a2789610b |
| 11 |
+======= |
|
| 12 |
+Version: 1.17.0 |
|
| 13 |
+>>>>>>> upstream/master |
|
| 10 | 14 |
Author: Vlad Petyuk with contributions from Laurent Gatto |
| 11 | 15 |
Maintainer: Vlad Petyuk <petyuk@gmail.com> |
| 12 | 16 |
Description: Extracts MS/MS ID data from mzIdentML (leveraging mzID package) or |