Clean read file

Public-Health-Scotland · Nov 7, 2024 · 73c23ee · 73c23ee
1 parent f7d43a6
commit 73c23ee
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/R/read_file.R b/R/read_file.R
@@ -11,12 +11,8 @@
 #' @param ... Addition arguments passed to the relevant function.
 #'
 #' @return the data a [tibble][tibble::tibble-package]
-<<<<<<< HEAD
 #' @noRd
 #' @keywords internal
-
-=======
->>>>>>> origin/main
 read_file <- function(path, col_select = NULL, ...) {
   valid_extensions <- c(
     "rds",