Resolved merge conflict in Server/index.js
This commit is contained in:
commit
e9bcf66b29
99 files changed
+5354
-358
No files matched your search
+5
-1
@@ -252,7 +252,11 @@ const startApp = async () => {
|
||||
ServiceRegistry.get(NotificationService.SERVICE_NAME)
|
||||
);
|
||||
|
||||
const distributedUptimeController = new DistributedUptimeController();
|
||||
const distributedUptimeController = new DistributedUptimeController(
|
||||
ServiceRegistry.get(MongoDB.SERVICE_NAME),
|
||||
http,
|
||||
ServiceRegistry.get(StatusService.SERVICE_NAME)
|
||||
);
|
||||
|
||||
//Create routes
|
||||
const authRoutes = new AuthRoutes(authController);
|
||||
|
||||
Reference in new issue
Block a user