Delete merge conflict marker

This fixes a bug introduced in commit 040057239e.
2020-12-20 18:32:07 -05:00 · 2020-12-20 18:32:07 -05:00 · d34a70c940
parent 170a230c3a
commit d34a70c940
1 changed files with 0 additions and 1 deletions
--- a/tests/backend/specs/api/importexport.js
+++ b/tests/backend/specs/api/importexport.js
@ -223,7 +223,6 @@ const testImports = {
    expectedHTML: '<!DOCTYPE HTML><html><body>Need more space<em> s</em> !<br><br></body></html>',
    expectedText: 'Need more space s !\n\n'
  },
->>>>>>> 5a47aff2... tests for spaces
 };

 describe(__filename, function () {