search

swcarpentry / r-novice-gapminder

R for Reproducible Scientific Analysis
http://swcarpentry.github.io/r-novice-gapminder/
Other
164 stars 538 forks source link

Fix merge conflicts for PR #552 #826

Closed matthieu-bruneaux closed 1 year ago

matthieu-bruneaux commented 1 year ago

This is a PR fixing the merge conflicts arising from #552.

It should allow for a clean merge of the content of #552 into main.

naupaka commented 1 year ago

Thanks! This looks good.