Merge remote-tracking branch 'origin/master'

# Conflicts: # tests/testthat.R
mjockers · Jul 28, 2017 · 6d4ba3d · 6d4ba3d
2 parents b08243a + 4edbaab
commit 6d4ba3d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,4 +1,5 @@
 Sys.unsetenv("R_TESTS") # Becasue https://github.com/hadley/testthat/issues/144
+
 library(testthat)
 library(syuzhet)