Resolved minor conflicts, refs carriedaymont#49

mitre · Jun 23, 2021 · f0c030a · f0c030a
2 parents 2a8bd51 + 02a92c3
commit f0c030a
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/R/growth.R b/R/growth.R
@@ -570,13 +570,12 @@ cleangrowth <- function(subjid,
 
   # adult: send to cleanadult to do most of the work ----
 
-  if (!quietly){
-    cat(sprintf("[%s] Begin processing adult data...\n", Sys.time()))
-  }
-
   # no need to do this if there's no data
   if (nrow(data.adult) > 0){
-    # create cluster to use and reuse
+    if (!quietly){
+      cat(sprintf("[%s] Begin processing adult data...\n", Sys.time()))
+    }
+
     # if parallel processing is desired, load additional modules
     if (parallel) {
       if (is.na(num.batches)) {