fix missed conflict

r-box · Feb 3, 2024 · d29e4db · d29e4db
1 parent 569ae1e
commit d29e4db
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -51,11 +51,8 @@ Imports:
     lifecycle,
     jsonlite,
     jose,
-<<<<<<< HEAD
-    cli
-=======
+    cli,
     withr
->>>>>>> 94b66e8fe7b4467badbc3be5204d8180c40a9127
 Suggests:
     clipr (>= 0.3.0),
     conflicted,