Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
lgatto committed Nov 14, 2023
2 parents fae19ed + 0445b1c commit 52e45fb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: QFeatures
Title: Quantitative features for mass spectrometry data
Version: 1.13.0
Version: 1.13.1
Authors@R: c(person("Laurent", "Gatto",
email = "[email protected]",
comment = c(ORCID = "0000-0002-1520-2268"),
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# QFeatures 1.13

## QFeatures 1.13.1

- Fix typo in vigette.

# QFeatures 1.11

## QFeatures 1.11.2
Expand Down
2 changes: 1 addition & 1 deletion vignettes/QFeatures.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ and possibly
hl |>
subsetByFeature("P42227-2") |>
longFormat() |>
as.data.frame |>
as.data.frame() |>
ggplot(aes(x = colname,
y = value,
group = rowname)) +
Expand Down

0 comments on commit 52e45fb

Please sign in to comment.