resolve more merge conflicts? · tidyverse/ggplot2@55cffa4 · GitHub

Commit

resolve more merge conflicts?

Browse files

Merge branch 'main' into colourbar_alpha

# Conflicts:
#	R/guide-colorbar.R
#	R/guide-colorsteps.R
#	man/guide_colourbar.Rd
#	man/guide_coloursteps.Rd
#	tests/testthat/test-guides.R

Loading branch information

teunbrand committed Dec 14, 2023

2 parents 505a3ee + 000a939 commit 55cffa4