updates pkgdown

ModelOriented · Nov 12, 2018 · 353d9bc · 353d9bc
1 parent dd0db0c
commit 353d9bc
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 466 deletions.
diff --git a/docs/articles/wine_quality_files/figure-html/forestplot-1.png b/docs/articles/wine_quality_files/figure-html/forestplot-1.png
diff --git a/docs/articles/wine_quality_files/figure-html/waterfallplot-1.png b/docs/articles/wine_quality_files/figure-html/waterfallplot-1.png
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -1,15 +1,6 @@
-<<<<<<< Updated upstream
-pandoc: 2.1.3
-pkgdown: 1.0.0
-pkgdown_sha: ~
-articles:
-  wine_quality: wine_quality.html
-
-=======
 pandoc: 1.19.2.1
 pkgdown: 1.1.0
 pkgdown_sha: ~
 articles:
   wine_quality: wine_quality.html
 
->>>>>>> Stashed changes