From eb7f85acf40f3b6c30f3229c7af8fc82ddc5cb75 Mon Sep 17 00:00:00 2001 From: Ari Lamstein Date: Tue, 29 Jun 2021 16:47:52 -0700 Subject: [PATCH 1/2] Fix typo. --- R/zzz.R | 1 + 1 file changed, 1 insertion(+) diff --git a/R/zzz.R b/R/zzz.R index bc04a11..84d2f89 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -4,5 +4,6 @@ conflict_prefer("read_csv", "tbltools", "readr") conflict_prefer("write_csv", "tbltools", "readr") conflict_prefer("read_fst", "tbltools", "fst") + conflict_prefer("readxl", "tbltools") conflict_prefer("filter", "dplyr", "stats") } From 19ff401a09766f4e5c9c8a3efcb4cd720ad242c1 Mon Sep 17 00:00:00 2001 From: Ari Lamstein Date: Tue, 29 Jun 2021 16:48:33 -0700 Subject: [PATCH 2/2] Add rule for read_xls. This function is present in both tbltools and the readxl package. --- R/zzz.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/zzz.R b/R/zzz.R index 84d2f89..281bba6 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -4,6 +4,6 @@ conflict_prefer("read_csv", "tbltools", "readr") conflict_prefer("write_csv", "tbltools", "readr") conflict_prefer("read_fst", "tbltools", "fst") - conflict_prefer("readxl", "tbltools") + conflict_prefer("read_xls", "tbltools") conflict_prefer("filter", "dplyr", "stats") }