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

fix(merge): fix merge issues

Browse source
This commit is contained in:
nixa 2016-07-12 11:02:30 +03:00
parent 660aa8a4b6
commit 563c6d0333
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/webpack.common.js
View file

@ -87,7 +87,8 @@ module.exports = {
loader: 'source-map-loader', loader: 'source-map-loader',
exclude: [ exclude: [
// these packages have problems with their sourcemaps // these packages have problems with their sourcemaps
helpers.root('node_modules/rxjs') helpers.root('node_modules/rxjs'),
helpers.root('node_modules/ng2-bootstrap'),
] ]
} }

2
src/platform/browser/providers.ts
View file

@ -23,7 +23,7 @@ export const APPLICATION_PROVIDERS = [
provideForms(), provideForms(),
...HTTP_PROVIDERS, ...HTTP_PROVIDERS,
...APP_ROUTER_PROVIDERS, ...APP_ROUTER_PROVIDERS,
{provide: LocationStrategy, useClass: HashLocationStrategy} {provide: LocationStrategy, useClass: HashLocationStrategy},
{provide: LocationStrategy, useClass: HashLocationStrategy} {provide: LocationStrategy, useClass: HashLocationStrategy}
]; ];