#22: Removed merged conflict lines

pharmaverse · Sep 15, 2024 · 356fd6d · 356fd6d
1 parent 4d4684b
commit 356fd6d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/vignettes/advs.Rmd b/vignettes/advs.Rmd
@@ -170,11 +170,7 @@ dataset, we re-derive `BMI` from the collected height and weight values.
 This is done to ensure that the `BMI` is calculated consistently across
 all subjects and visits.
 
-<<<<<<< HEAD
-In this step, we create parameter Body Mass Index (BMI) for the `ADVS`
-=======
 In this step, we create parameter Body Mass Index (`BMI`) for the `ADVS`
->>>>>>> 4b1c85d (#22 : Resolved comments and no hidden codes)
 domain using the `derive_param_bmi()` function. Note that only variables
 specified in the `by_vars` argument will be populated in the newly
 created records. Also note that if height is collected only once for a