Commit 5d993dc3 authored by Olivia Madrid's avatar Olivia Madrid

resolve merge conflict duplicat identifier

1 merge request!686WIP: Epic/wallet 80
Pipeline #119098420 running with stages
import { Client } from '../api/client.service';
import { Injectable, Inject } from '@angular/core';
import { Subject } from 'rxjs';
import { Injectable, Inject, Optional, Injector } from '@angular/core';
import { RedirectService } from './redirect.service';
......
......@@ -31,6 +31,7 @@ import { TransactionOverlayService } from '../../blockchain/transaction-overlay/
import { ConfigsService } from '../../../common/services/configs.service';
import { TokenContractService } from '../../blockchain/contracts/token-contract.service';
import { WithdrawContractService } from '../../blockchain/contracts/withdraw-contract.service';
import { AnalyticsModule } from '../../analytics/analytics.module';
//////////////////////////////////////////////////
// TODO add a wildcard and the parameter routes as children once feature-flag is lifted
......@@ -72,6 +73,7 @@ export const WALLET_V2_ROUTES: Routes = [
ReactiveFormsModule,
CommonModule,
RouterModule,
AnalyticsModule,
],
declarations: [
WalletDashboardComponent,
......
Please register or to comment