libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

Delete merge conflict marker

Browse source 
This fixes a bug introduced in commit
040057239e.
This commit is contained in:
Richard Hansen 2020-12-20 18:32:07 -05:00
parent 170a230c3a
commit d34a70c940
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/backend/specs/api/importexport.js
View file

@ -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 () {