mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 09:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

resolve conflict

Browse source
This commit is contained in:
John McLear 2021-01-30 08:11:10 +00:00
commit 96520a3f31
13 changed files with 458 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/backend/common.js
View file

@ -50,10 +50,10 @@ exports.init = async function () {
after(async function () {
webaccess.authnFailureDelayMs = backups.authnFailureDelayMs;
await server.stop();
// Note: This does not unset settings that were added.
Object.assign(settings, backups.settings);
log4js.setGlobalLogLevel(logLevel);
await server.exit();
});
return exports.agent;