From d34a70c9403e49d60d27ba6b0b837544d5b6649e Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sun, 20 Dec 2020 18:32:07 -0500 Subject: [PATCH] Delete merge conflict marker This fixes a bug introduced in commit 040057239e557aaed39fd47062248597ec4054c9. --- tests/backend/specs/api/importexport.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/backend/specs/api/importexport.js b/tests/backend/specs/api/importexport.js index bfafc6b31..5252f1300 100644 --- a/tests/backend/specs/api/importexport.js +++ b/tests/backend/specs/api/importexport.js @@ -223,7 +223,6 @@ const testImports = { expectedHTML: 'Need more space s !

', expectedText: 'Need more space s !\n\n' }, ->>>>>>> 5a47aff2... tests for spaces }; describe(__filename, function () {