resolving github

Merge branch 'newbranch' of https://github.com/Merck/psm3mkv into newbranch
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

tests/testthat/test-basics.R

@@ -281,5 +281,5 @@ for (i in 1:length(knots)) {
 test_that("survival at time zero is 1", {
   expect_equal(szeros_par, rep(1, length(dists)))
   expect_equal(szeros_spl, rep(1, length(knots) * length(scales)))
-})
 
+})