Skip to content
Snippets Groups Projects
Commit 6a4290df authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

fix: merge conflit

parent 1a1732f6
No related branches found
No related tags found
3 merge requests!27Recette,!26Dev,!16Poc/api aptic
<<<<<<< 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment