resolve merge conflict

Merge branch 'main' into discrete_palette

# Conflicts:
#	R/scale-discrete-.R

R/scale-discrete-.R

@@ -14,6 +14,7 @@
 #' @inheritParams discrete_scale
 #' @param palette A function that takes the limits as input and provides
 #'   numerical values as output.
+#' @param sec.axis [dup_axis()] is used to specify a secondary axis.
 #' @rdname scale_discrete
 #' @family position scales
 #' @seealso
@@ -66,8 +67,8 @@
 #'   scale_x_discrete(labels = abbreviate)
 #' }
 scale_x_discrete <- function(name = waiver(), ..., palette = seq_len,
-                             expand = waiver(),
-                             guide = waiver(), position = "bottom") {
+                             expand = waiver(), guide = waiver(),
+                             position = "bottom", sec.axis = waiver()) {
   sc <- discrete_scale(
     aesthetics = c("x", "xmin", "xmax", "xend"), name = name,
     palette = palette, ...,
@@ -81,8 +82,8 @@ scale_x_discrete <- function(name = waiver(), ..., palette = seq_len,
 #' @rdname scale_discrete
 #' @export
 scale_y_discrete <- function(name = waiver(), ..., palette = seq_len,
-                             expand = waiver(),
-                             guide = waiver(), position = "left") {
+                             expand = waiver(), guide = waiver(),
+                             position = "left", sec.axis = waiver()) {
   sc <- discrete_scale(
     aesthetics = c("y", "ymin", "ymax", "yend"), name = name,
     palette = palette, ...,