Manually merge fixes

Closes #150
This commit is contained in:
hadley 2016-07-22 11:23:53 -05:00
parent 52c609eaad
commit b3e09d087b
1 changed files with 3 additions and 3 deletions

View File

@ -231,8 +231,8 @@ This book isn't just the product of Hadley and Garrett, but is the result of man
learning perspective, and the difference between hypothesis generation and learning perspective, and the difference between hypothesis generation and
hypothesis confirmation. hypothesis confirmation.
* Yihui Xie for his work on the bookdown package, and for tirelessly * Yihui Xie for his work on the [bookdown](https://github.com/rstudio/bookdown)
responding to my feature requests. package, and for tirelessly responding to my feature requests.
* Bill Behrman for his thoughtful reading of the entinre book, and for trying * Bill Behrman for his thoughtful reading of the entinre book, and for trying
it out with his data science class at Stanford. it out with his data science class at Stanford.
@ -256,7 +256,7 @@ cat(".\n")
## Colophon ## Colophon
An online version of this book is available at <http://r4ds.had.co.nz>. It will continue to evolve in between reprints of the physical book. The source of the book is available at <http://github.com/hadley/r4ds>. The book is powered by <https://bookdown.org> which makes it easy to turn R markdown files into html, pdf, and epub. An online version of this book is available at <http://r4ds.had.co.nz>. It will continue to evolve in between reprints of the physical book. The source of the book is available at <https://github.com/hadley/r4ds>. The book is powered by <https://bookdown.org> which makes it easy to turn R markdown files into html, pdf, and epub.
This book was built with: This book was built with: