resolve merge conflicts

This commit is contained in:
Vishnu Sreekumaran Nair committed 2025-05-07 16:18:26 -04:00
commit 3e8c7cf32c
57 files changed
+907 -13928

No files matched your search

@@ -101,7 +101,7 @@ export const updatePageSpeed = createAsyncThunk(
name: monitor.name,
description: monitor.description,
interval: monitor.interval,
// notifications: monitor.notifications,
notifications: monitor.notifications,
};
const res = await networkService.updateMonitor({
monitorId: monitor._id,
@@ -5,7 +5,7 @@ const initialState = {
isLoading: false,
apiBaseUrl: "",
logLevel: "debug",
language: "",
language: "gb",
pagespeedApiKey: "",
};