fix conflicts

2020-11-21 02:11:20 -05:00
parent d2572ba4e4
commit f0ac9d6935
4 changed files with 11 additions and 6 deletions
--- a/src/errors/APIError.ts
+++ b/src/errors/APIError.ts
@@ -29,7 +29,7 @@ class APIError extends ExtendableError {
   * @param {object} data - response data to be returned.
   * @param {boolean} isPublic - Whether the message should be visible to user or not.
   */
-  constructor(message, status = httpStatus.INTERNAL_SERVER_ERROR, data, isPublic = false) {
+  constructor(message: string, status: number = httpStatus.INTERNAL_SERVER_ERROR, data: any, isPublic: boolean = false) {
    super(message, status, data, isPublic);
  }
 }