Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 23:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve merge conflict

Browse source
This commit is contained in:
Zuhdan Ubay 2020-05-26 10:54:18 +07:00
parent ddd17c56e6
commit 59fb27fc7d
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/app/pages/pages-routing.module.ts
View file

@ -5,6 +5,8 @@ import {PagesComponent} from './pages.component';
import {NotFoundComponent} from './miscellaneous/not-found/not-found.component'; import {NotFoundComponent} from './miscellaneous/not-found/not-found.component';
import {PromotionComponent} from './promotion/promotion.component'; import {PromotionComponent} from './promotion/promotion.component';
import { PartnerPriceComponent } from './partner-price/partner-price.component'; import { PartnerPriceComponent } from './partner-price/partner-price.component';
import {BillingComponent} from './billing/billing.component';
import {ServiceAgreementComponent} from './service-agreement/sa.component';
import { LoginComponent } from './auth/login.component'; import { LoginComponent } from './auth/login.component';
const routes: Routes = [{ const routes: Routes = [{
@ -21,7 +23,7 @@ const routes: Routes = [{
}, },
{ {
path: 'service-agreement', path: 'service-agreement',
component: NotFoundComponent, component: ServiceAgreementComponent,
}, },
{ {
path: 'partner-branch', path: 'partner-branch',
@ -29,7 +31,7 @@ const routes: Routes = [{
}, },
{ {
path: 'billing', path: 'billing',
component: NotFoundComponent, component: BillingComponent,
}, },
{ {
path: 'auth', path: 'auth',