amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update http.exception.ts

Browse Source 
Some remains from a git merge/rebase conflict
This commit is contained in:
Alexandru Furculita ♻
2018-04-19 14:20:22 +03:00
committed by GitHub
parent 998a24d62f
commit e842768bb1
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/common/exceptions/http.exception.ts
View File

@@ -2,13 +2,8 @@ export class HttpException extends Error {
public readonly message: any;
/**
<<<<<<< HEAD
* The base Nest Application exception which is handled by the default Exceptions Handler.
* If you throw an exception from your HTTP route handlers, Nest will map them to the appropriate HTTP response and send to the client.
=======
* The base Nest Application exception, which is handled by the default Exceptions Handler.
* If you throw an exception from your HTTP route handler, Nest will map them to the appropriate HTTP response and send to the client.
>>>>>>> master
*
* When `response` is an object:
* - object will be stringified and returned to the user as a JSON response,