fixing merge conflicts

belhajManel · May 2, 2024 · b086f72 · b086f72
1 parent 9dff762
commit b086f72
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/front/src/app/app-routing.module.ts b/front/src/app/app-routing.module.ts
@@ -59,7 +59,7 @@ const routes: Routes = [
       import('./modules/contact/contact.module').then((m) => m.ContactModule),
   },
 
-    path: 'download',
+   { path: 'download',
     loadChildren: () =>
       import('./modules/download/download.module').then(
         (m) => m.DownloadModule

diff --git a/front/src/app/app.module.ts b/front/src/app/app.module.ts
@@ -7,7 +7,6 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { CoreModule } from './core/core.module';
 import { AuthModule } from './modules/auth/auth.module';
 import { AuthService } from './modules/auth/services/auth.service';
-import { HttpClientModule } from '@angular/common/http';
 import { AboutComponent } from './modules/about/about.component';
 import { ServiceComponent } from './modules/service/service.component';
 import { ContactComponent } from './modules/contact/contact.component';
@@ -25,8 +24,6 @@ import { AuthGuard } from './core/guards/auth.guard';
     ServiceComponent,
     ContactComponent,
   ],
-  providers: [AuthService],
-  bootstrap: [AppComponent],
   imports: [
     BrowserModule,
     AppRoutingModule,