From 8570feb7940b293b125aebd74f7a4eab7fe32968 Mon Sep 17 00:00:00 2001 From: boB Rudis Date: Mon, 27 Feb 2017 07:04:19 -0500 Subject: [PATCH] keybase --- README.Rmd | 3 ++- README.md | 14 +++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/README.Rmd b/README.Rmd index 10b420e..c6d8c4e 100644 --- a/README.Rmd +++ b/README.Rmd @@ -12,6 +12,7 @@ knitr::opts_chunk$set(collapse=TRUE, comment="##", fig.retina=2, fig.path = "REA [![Travis-CI Build Status](https://travis-ci.org/hrbrmstr/hrbrthemes.svg?branch=master)](https://travis-ci.org/hrbrmstr/hrbrthemes) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/hrbrthemes)](https://cran.r-project.org/package=hrbrthemes) ![downloads](http://cranlogs.r-pkg.org/badges/grand-total/hrbrthemes) +[![keybase verified](https://img.shields.io/badge/keybase-verified-brightgreen.svg)](https://gist.github.com/hrbrmstr/be2f2c14fd78cac24697) ---- @@ -162,7 +163,7 @@ library(testthat) date() -test_dir(system.file("tests", package = "hrbrthemes")) +test_dir("tests/") ``` ### Code of Conduct diff --git a/README.md b/README.md index 72b1a95..eea5093 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,8 @@ -<<<<<<< HEAD -[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/0.1.0/active.svg)](http://www.repostatus.org/#active) [![codecov](https://codecov.io/gh/hrbrmstr/hrbrthemes/branch/master/graph/badge.svg)](https://codecov.io/gh/hrbrmstr/hrbrthemes) [![Travis-CI Build Status](https://travis-ci.org/hrbrmstr/hrbrthemes.svg?branch=master)](https://travis-ci.org/hrbrmstr/hrbrthemes) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/hrbrthemes)](https://cran.r-project.org/package=hrbrthemes) ![downloads](http://cranlogs.r-pkg.org/badges/grand-total/hrbrthemes) [![keybase verified](https://img.shields.io/badge/keybase-verified-brightgreen.svg)](https://gist.github.com/hrbrmstr/be2f2c14fd78cac24697) -======= `hrbrthemes` : Additional Themes and Theme Components for 'ggplot2' ------------------------------------------------------------------- -[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/0.1.0/active.svg)](http://www.repostatus.org/#active) [![codecov](https://codecov.io/gh/hrbrmstr/hrbrthemes/branch/master/graph/badge.svg)](https://codecov.io/gh/hrbrmstr/hrbrthemes) [![Travis-CI Build Status](https://travis-ci.org/hrbrmstr/hrbrthemes.svg?branch=master)](https://travis-ci.org/hrbrmstr/hrbrthemes) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/hrbrthemes)](https://cran.r-project.org/package=hrbrthemes) ![downloads](http://cranlogs.r-pkg.org/badges/grand-total/hrbrthemes) ->>>>>>> 47263e16b6cf138ede5e0bde1a6007cae4a3802c +[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/0.1.0/active.svg)](http://www.repostatus.org/#active) [![codecov](https://codecov.io/gh/hrbrmstr/hrbrthemes/branch/master/graph/badge.svg)](https://codecov.io/gh/hrbrmstr/hrbrthemes) [![Travis-CI Build Status](https://travis-ci.org/hrbrmstr/hrbrthemes.svg?branch=master)](https://travis-ci.org/hrbrmstr/hrbrthemes) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/hrbrthemes)](https://cran.r-project.org/package=hrbrthemes) ![downloads](http://cranlogs.r-pkg.org/badges/grand-total/hrbrthemes) [![keybase verified](https://img.shields.io/badge/keybase-verified-brightgreen.svg)](https://gist.github.com/hrbrmstr/be2f2c14fd78cac24697) ------------------------------------------------------------------------ @@ -170,13 +166,9 @@ library(hrbrthemes) library(testthat) date() -<<<<<<< HEAD -## [1] "Mon Feb 27 06:59:49 2017" -======= -## [1] "Sun Feb 26 20:28:39 2017" ->>>>>>> 47263e16b6cf138ede5e0bde1a6007cae4a3802c +## [1] "Mon Feb 27 07:03:41 2017" -test_dir(system.file("tests", package = "hrbrthemes")) +test_dir("tests/") ## testthat results ======================================================================================================== ## OK: 10 SKIPPED: 0 FAILED: 0 ##