From b0e357f43be9c554325f1a75a5acf7071356324b Mon Sep 17 00:00:00 2001
From: jeffeaton <jeffrey.eaton@imperial.ac.uk>
Date: Thu, 2 Jan 2025 21:45:04 +0000
Subject: [PATCH] fix cruff

---
 DESCRIPTION         | 1 -
 R/pepfar-datapack.R | 1 -
 2 files changed, 2 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 63d55279..cb04f802 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,6 @@
 Package: naomi
 Title: Naomi Model for Subnational HIV Estimates
 Version: 2.10.7
->>>>>>> origin/master
 Authors@R:
     person(given = "Jeff",
            family = "Eaton",
diff --git a/R/pepfar-datapack.R b/R/pepfar-datapack.R
index 86e2255f..1aca73b5 100644
--- a/R/pepfar-datapack.R
+++ b/R/pepfar-datapack.R
@@ -208,7 +208,6 @@ build_datapack_output <- function(naomi_output, psnu_level, dmppt2_output) {
       age_sex_rse,
       district_rse,
       country_or_psnu
-     
     )
 }