conflits

src/app/pages/filters-page/filters-page.component.html

@@ -47,16 +47,14 @@
 
         <div class="minMax p-3">
           <span>Veuillez sélectionner la gamme de prix souhaitée</span>
-          <br>
-          <span>1(1 à 10)  2(11 à 20)  3(21 à 30)  4(31 à 20)</span>
         </div>
         <input type="range" class="form-range" ng-model="valuePrix" min="{{minPrice}}" max="{{maxPrice}}"
           (change)="OnChangeValuePrice($event)">
         <div class="valuesPrix d-flex d-flex justify-content-between">
-          <span>1</span>
-          <span>2</span>
-          <span>3</span>
-          <span>4</span>
+          <span>1-10€</span>
+          <span>11-20€</span>
+          <span>21-30€</span>
+          <span>31-40€</span>
         </div>
       </div>
     </div>

src/app/pages/page-acces-denied/page-acces-denied.component.html

@@ -1,3 +0,0 @@
-<div class="container">
-    <p>test</p>
-</div>

src/app/pages/page-acces-denied/page-acces-denied.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PageAccesDeniedComponent } from './page-acces-denied.component';
-
-describe('PageAccesDeniedComponent', () => {
-  let component: PageAccesDeniedComponent;
-  let fixture: ComponentFixture<PageAccesDeniedComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ PageAccesDeniedComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PageAccesDeniedComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/pages/page-acces-denied/page-acces-denied.component.ts

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-page-acces-denied',
-  templateUrl: './page-acces-denied.component.html',
-  styleUrls: ['./page-acces-denied.component.scss']
-})
-export class PageAccesDeniedComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}

src/app/pages/page-denied/page-denied.component.html

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 <div class="container mb-5">
+=======
+<div class="container mb-5 mt-5">
+>>>>>>> main
 <img src="assets/you-shall-not-pass.gif"/>
 </div>