explore-libraries Demo repo for rstudio::conf 2018 workshop This is a git workshop with Jenny Bryan at RStudio::conf 2018 This is a line that I've added on the GitHub page! I've had a lot of coffee... Conflict Resolution - Winning the conflicts