updtae

src/controllers/user.ts

@@ -1,10 +1,6 @@
 import axios from "axios"
 import config from "config"
-<<<<<<< HEAD
-import { Paging, User, UserRefreshToken, UserRole, HrmsEmployee } from "entity"
-=======
 import { HrmsEmployee, Paging, User, UserRefreshToken, UserRole } from "entity"
->>>>>>> f562ccf38baffaa1cb6caf8a196127fe2512c7e4
 import exceljs from "exceljs"
 import { NextFunction, Response } from "express"
 import { Request } from "express-jwt"