From d29e4dbf953f227df29f8498db9f7fb80f1e47ec Mon Sep 17 00:00:00 2001
From: Ian Lyttle <ijlyttle@me.com>
Date: Sat, 3 Feb 2024 14:48:12 -0600
Subject: [PATCH] fix missed conflict

---
 DESCRIPTION | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index d1f828a..042ddb4 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -51,11 +51,8 @@ Imports:
     lifecycle,
     jsonlite,
     jose,
-<<<<<<< HEAD
-    cli
-=======
+    cli,
     withr
->>>>>>> 94b66e8fe7b4467badbc3be5204d8180c40a9127
 Suggests:
     clipr (>= 0.3.0),
     conflicted,