Update Spectra.R

rformassspectrometry · Dec 4, 2024 · 4b182d3 · 4b182d3
1 parent d7c0a91
commit 4b182d3
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/R/Spectra.R b/R/Spectra.R
@@ -533,11 +533,6 @@ NULL
 #'      should be explored and ideally be removed using for
 #'      `QFeatures::reduceDataFrame()`, `PMS::reducePSMs()` or similar
 #'      functions.
-<<<<<<< HEAD
-#'    For a more general function that allows to append `data.frame`,
-#'    `DataFrame` and `matrix` see `cbind2()`.
-=======
->>>>>>> parent of d063996 (Addition of cbind2())
 #'
 #' Several `Spectra` objects can be concatenated into a single object with the
 #' `c()` or the `concatenateSpectra()` function. Concatenation will fail if the