fixed merge conflicts

This commit is contained in:
olivermrbl committed 2021-02-19 08:47:24 +01:00
commit c31e1ea691
25 files changed
+1294 -63

No files matched your search

@@ -11,7 +11,7 @@ class TestNotiService extends NotificationService {
return Promise.resolve();
}
async reSendNotification() {
async resendNotification() {
return Promise.resolve();
}
}