ye olde push-than-pull merge conflict

Merge branch 'master' of github.com:pboesu/DEButilities # Conflicts: # R/get_tb.R
pboesu · Jan 23, 2018 · eaf183c · eaf183c
2 parents c663d36 + 7e8f42b
commit eaf183c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/R/get_tb.R b/R/get_tb.R
@@ -79,7 +79,9 @@ get_tb <- function(p, eb = 1, lb=NA){
   #library(pracma)
   abxb=c(ab,xb)
   tb = 3 * quad(dget_tb, xa= 1e-15, xb=xb, tol = 1.0e-12, trace = FALSE, abxb)
+
   return(c(tb = unname(tb), lb = unname(lb), info = unname(info)))
+
 }
 
   # subfunction