Skip to content

Commit ac4b6bc

Browse files
committed
update dependencies
1 parent 369b02e commit ac4b6bc

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

NAMESPACE

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ importFrom(rlang,is_spliced)
114114
importFrom(rlang,quo_is_null)
115115
importFrom(rlang,quo_name)
116116
importFrom(rlang,quo_squash)
117+
<<<<<<< HEAD
118+
=======
119+
importFrom(rlang,set_names)
120+
importFrom(stats,setNames)
121+
>>>>>>> 57e61fd (update dependencies)
117122
importFrom(stringr,regex)
118123
importFrom(stringr,str_detect)
119124
importFrom(stringr,str_replace)

R/utilities.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,6 +1297,7 @@ is_filer_columns_in_column_selection <- function(.data, ...) {
12971297
error = function(e) FALSE)
12981298
}
12991299

1300+
#' @importFrom rlang set_names
13001301
check_if_assays_are_NOT_consistently_ordered <- function(se) {
13011302

13021303
# If I have any assay at all

0 commit comments

Comments
 (0)