Merge branch 'development' of...

Merge branch 'development' of https://gitlab.alpha.grandlyon.com/refonte-data/service-organizations into development

src/links/links.service.ts

@@ -42,7 +42,11 @@ 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);