Skip to content

Commit da2388e

Browse files
authored
Revert "Import lifecycle (#3902)" (#3904)
This reverts commit f8bcc75.
1 parent f8bcc75 commit da2388e

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,6 @@ Collate:
254254
'zxx.r'
255255
'zzz.r'
256256
VignetteBuilder: knitr
257-
RoxygenNote: 7.1.0
257+
RoxygenNote: 7.0.2
258258
Roxygen: list(markdown = TRUE)
259259
Encoding: UTF-8

R/zzz.r

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ pathGrob <- NULL
5050
ggplot_global$date_origin <- date - unclass(date)
5151
time <- Sys.time()
5252
ggplot_global$time_origin <- time - unclass(time)
53+
54+
# To avoid namespace clash with dplyr.
55+
# It seems surprising that this hack works
56+
if (requireNamespace("dplyr", quietly = TRUE)) {
57+
vars <<- dplyr::vars
58+
}
5359
}
5460

5561
release_questions <- function() {

0 commit comments

Comments
 (0)