Skip to content

Resolve issue with Pkgdown #65

Open
Thomas-Caspar-Fischer wants to merge 87 commits into
masterfrom
dev
Open

Resolve issue with Pkgdown #65
Thomas-Caspar-Fischer wants to merge 87 commits into
masterfrom
dev

Conversation

@Thomas-Caspar-Fischer
Copy link
Copy Markdown
Contributor

No description provided.

tknecht and others added 30 commits June 10, 2022 13:32
Merge branch 'dev' of https://github.com/statistikZH/statR into dev

# Conflicts:
#	.Rbuildignore
#	DESCRIPTION
#	docs/articles/Visualisierungen.html
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-10-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-11-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-12-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-13-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-5-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-6-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-7-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-8-1.png
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-9-1.png
#	docs/news/index.html
#	docs/pkgdown.yml
#	docs/reference/datasetsXLSX.html
#	docs/reference/display.statcol.all-1.png
#	docs/reference/display.statcol.all.html
#	docs/reference/motor_trend_car_road_tests.xlsx
#	vignettes/Visualisierungen.Rmd
Thomas-Caspar-Fischer and others added 30 commits January 26, 2024 10:19
…rkaround for temporary installation (forgoes write to configstore during temp install); (0e, 0w, 0n). (#61)
Merge branch 'dev' of https://github.com/statistikZH/statR into dev

# Conflicts:
#	R/user_config.R
#	inst/extdata/config/default.yaml
…t to NA; updated vignette to account for changed use of user configurations.
Merge branch 'master' into dev

# Conflicts:
#	docs/articles/Excel-Tabellen.html
#	docs/articles/Visualisierungen.html
#	docs/articles/index.html
#	vignettes/Excel-Tabellen.Rmd
Fix for redundant title on index sheet
Merge branch 'master' into dev

# Conflicts:
#	docs/articles/Visualisierungen_files/figure-html/unnamed-chunk-14-1.png
#	docs/pkgdown.yml
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.

7 participants