conflict resolved
This commit is contained in:
commit
468f2b3ded
@ -342,6 +342,9 @@ router.delete("/admin_users/:id",[verifySignature, verifyToken], adminUserContro
|
||||
|
||||
|
||||
|
||||
router.get("/testEmail", establishmentController.testEmail);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
@ -2103,7 +2106,7 @@ router.get("/submissions/getPreviousForecastData",[verifySignature, verifyToken]
|
||||
* 500:
|
||||
* description: Server error
|
||||
*/
|
||||
router.get("/submission-audit-history",[verifySignature, verifyToken], submissionController.getSubmissionHistory);
|
||||
router.get("/submission-audit-history",[verifySignature, verifyToken], submissionController.getSubmissionHistory);
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user