fix(merge): fix merge issues

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

View file

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