fix: resolve conflict

This commit is contained in:
cihat committed 2025-02-11 08:15:29 +03:00
1 parent 93fa4ca13b
commit fddaf8f11f
4 files changed
+8 -163

No files matched your search

+2 -2
View File
@@ -83,7 +83,7 @@ class StatusPageController {
try {
const statusPage = await this.db.getStatusPageByUrl(req.params.url, req.query.type);
return res.success({
msg: successMessages.STATUS_PAGE_BY_URL,
msg: this.stringService.statusPageByUrl,
data: statusPage,
});
} catch (error) {
@@ -96,7 +96,7 @@ class StatusPageController {
const teamId = req.params.teamId;
const statusPages = await this.db.getStatusPagesByTeamId(teamId);
return res.success({
msg: successMessages.STATUS_PAGE_BY_TEAM_ID,
msg: this.stringService.statusPageByTeamId,
data: statusPages,
});
} catch (error) {