From be5ba7c69d70ea2afd4195100990c0e1456be73b Mon Sep 17 00:00:00 2001
From: Michael Rogers <contact@mhrogers.com>
Date: Fri, 23 Jun 2023 16:39:07 -0500
Subject: [PATCH] Merge conflict extra line

---
 src/api/annotation/AnnotationAPISpec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/annotation/AnnotationAPISpec.js b/src/api/annotation/AnnotationAPISpec.js
index 5597e024f5..318220ba2e 100644
--- a/src/api/annotation/AnnotationAPISpec.js
+++ b/src/api/annotation/AnnotationAPISpec.js
@@ -313,4 +313,4 @@ describe('The Annotation API', () => {
       expect(areNotEqual).toBeFalse();
     });
   });
-});
\ No newline at end of file
+});