diff options
author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-08-04 00:19:58 +0530 |
---|---|---|
committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-08-04 00:19:58 +0530 |
commit | 9043bea3bda78b2adf1a5d841bfaf6bec903e3e1 (patch) | |
tree | e5eaf53bde22035a2074327a781056bf4f9d1d12 /src/server/RouteManager.ts | |
parent | 2331b3a271cc53390d281fa16a553467a3d7a7de (diff) | |
parent | fb8150f01232a3f8e9333f9ed7012b6982b00c24 (diff) |
merge conflicts resolved
Diffstat (limited to 'src/server/RouteManager.ts')
-rw-r--r-- | src/server/RouteManager.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/RouteManager.ts b/src/server/RouteManager.ts index 1a2340afc..78b75d6be 100644 --- a/src/server/RouteManager.ts +++ b/src/server/RouteManager.ts @@ -1,8 +1,8 @@ -import RouteSubscriber from "./RouteSubscriber"; -import { DashUserModel } from "./authentication/DashUserModel"; -import { Request, Response, Express } from 'express'; -import { cyan, red, green } from 'colors'; +import { cyan, green, red } from 'colors'; +import { Express, Request, Response } from 'express'; import { AdminPriviliges } from "."; +import { DashUserModel } from "./authentication/DashUserModel"; +import RouteSubscriber from "./RouteSubscriber"; export enum Method { GET, |