Skip to content

Commit e842768

Browse files
authored
Update http.exception.ts
Some remains from a git merge/rebase conflict
1 parent 998a24d commit e842768

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

packages/common/exceptions/http.exception.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@ export class HttpException extends Error {
22
public readonly message: any;
33

44
/**
5-
<<<<<<< HEAD
6-
* The base Nest Application exception which is handled by the default Exceptions Handler.
7-
* If you throw an exception from your HTTP route handlers, Nest will map them to the appropriate HTTP response and send to the client.
8-
=======
95
* The base Nest Application exception, which is handled by the default Exceptions Handler.
106
* If you throw an exception from your HTTP route handler, Nest will map them to the appropriate HTTP response and send to the client.
11-
>>>>>>> master
127
*
138
* When `response` is an object:
149
* - object will be stringified and returned to the user as a JSON response,

0 commit comments

Comments
 (0)