From 6ba29546cf14aaf8bbf938a41db1480a50494614 Mon Sep 17 00:00:00 2001 From: William Hutchison Date: Tue, 3 Sep 2024 13:53:05 +1000 Subject: [PATCH] Remove merge resolution comment --- R/methods_SE.R | 7 ------- 1 file changed, 7 deletions(-) diff --git a/R/methods_SE.R b/R/methods_SE.R index dac8a85a..9eaf4c8c 100755 --- a/R/methods_SE.R +++ b/R/methods_SE.R @@ -2910,7 +2910,6 @@ setMethod("describe_transcript", "SummarizedExperiment", #' @docType methods #' @rdname describe_transcript-methods #' -<<<<<<< HEAD #' @return A consistent object (to the input) including additional columns for transcript symbol setMethod("describe_transcript", "RangedSummarizedExperiment", .describe_transcript_SE) @@ -2966,9 +2965,3 @@ setMethod("resolve_complete_confounders_of_non_interest", setMethod("resolve_complete_confounders_of_non_interest", "RangedSummarizedExperiment", .resolve_complete_confounders_of_non_interest) -======= -#' @return A consistent object (to the input) including additional columns -#' for transcript symbol -setMethod("describe_transcript", "RangedSummarizedExperiment", - .describe_transcript_SE) ->>>>>>> chilampoon-improve-documentation