fixed merge conflicts

2021-02-19 08:47:24 +01:00
parent 135d45ad45 99ad43bf47
commit c31e1ea691
25 changed files with 1294 additions and 63 deletions
--- a/integration-tests/api/src/services/test-not.js
+++ b/integration-tests/api/src/services/test-not.js
@@ -11,7 +11,7 @@ class TestNotiService extends NotificationService {
    return Promise.resolve();
  }

-  async reSendNotification() {
+  async resendNotification() {
    return Promise.resolve();
  }
 }