Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main to dev #427

Merged
merged 15 commits into from
Nov 12, 2024
Merged

Main to dev #427

merged 15 commits into from
Nov 12, 2024

Conversation

dajmcdon
Copy link
Contributor

Checklist

Please:

  • Make sure this PR is against "dev", not "main".
  • Request a review from one of the current epipredict main reviewers:
    dajmcdon.
  • Make sure to bump the version number in DESCRIPTION and NEWS.md.
    Always increment the patch version number (the third number), unless you are
    making a release PR from dev to main, in which case increment the minor
    version number (the second number).

Change explanations for reviewer

  • Moves the dev branch to have the same type of pkgdown site as on main.

dshemetov and others added 14 commits October 4, 2024 11:04
Merge branch 'dev' into main-to-dev

# Conflicts:
#	.github/workflows/pkgdown.yaml
#	DESCRIPTION
#	R/layer_population_scaling.R
#	R/step_population_scaling.R
#	_pkgdown.yml
#	man/layer_population_scaling.Rd
#	man/step_population_scaling.Rd
#	tests/testthat/test-arg_is_.R
#	tests/testthat/test-check-training-set.R
#	tests/testthat/test-population_scaling.R
#	tests/testthat/test-snapshots.R
#	tests/testthat/test-target_date_bug.R
Merge branch 'dev' into main-to-dev
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
@dajmcdon dajmcdon merged commit f8b7945 into dev Nov 12, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants