From 6a4290df9a0c42134f10b61c7de31d542acfc3fe Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Fri, 15 Jan 2021 13:38:18 +0100
Subject: [PATCH] fix: merge conflit
---
src/structures/services/aptic-structures.service.ts | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/structures/services/aptic-structures.service.ts b/src/structures/services/aptic-structures.service.ts
index 473382794..7a6e1a65a 100644
--- a/src/structures/services/aptic-structures.service.ts
+++ b/src/structures/services/aptic-structures.service.ts
@@ -1,15 +1,10 @@
-<<<<<<< HEAD
import { HttpService, Injectable } from '@nestjs/common';
-=======
-import { HttpException, HttpService, Injectable, HttpStatus } from '@nestjs/common';
->>>>>>> 66054863ffda381a5f15d9419e3577717b2c9798
import { Logger } from '@nestjs/common';
import { Observable } from 'rxjs';
import { AxiosResponse } from 'axios';
import { Cron, CronExpression } from '@nestjs/schedule';
import * as _ from 'lodash';
import * as https from 'https';
-<<<<<<< HEAD
import { InjectModel } from '@nestjs/mongoose';
import { Model } from 'mongoose';
import { Structure, StructureDocument } from '../schemas/structure.schema';
@@ -22,12 +17,6 @@ export class ApticStructuresService {
private readonly httpService: HttpService,
@InjectModel(Structure.name) private structureModel: Model<StructureDocument>
) {}
-=======
-
-@Injectable()
-export class ApticStructuresService {
- constructor(private readonly httpService: HttpService) {}
->>>>>>> 66054863ffda381a5f15d9419e3577717b2c9798
public formatApticStructures(postalCodeData: any[]): any {
// Get all postal code in one array
--
GitLab