Commit fca9e382 authored by FORESTIER Fabien's avatar FORESTIER Fabien
Browse files

Fix unwanted merge marker

parent b951b514
Pipeline #2378 passed with stages
in 37 seconds
......@@ -42,11 +42,7 @@ export class LinksService {
const linksCount = await qb.getCount().catch((error) => {
this.logger.error(`Error while getting the count of links.`, error, `${LinksService.name} - ${this.findAll.name}`);
throw new InternalServerErrorException({ error, message: 'Error while getting the count of links.' });
<<<<<<< HEAD
});
=======
});;
>>>>>>> eacdb83221bc84b480bd0a907afbbe4e924a9f7f
if ('limit' in query) {
qb.limit(query.limit);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment