merge: resolve conflicts

This commit is contained in:
Kamil Myśliwiec
2018-09-21 09:22:26 +02:00
39 changed files with 127 additions and 127 deletions

View File

@@ -271,7 +271,7 @@ export class DependenciesScanner {
const providersKeys = Object.keys(applyProvidersMap);
const type = component.provide;
if (providersKeys.indexOf(type) < 0) {
if (!providersKeys.includes(type)) {
return this.container.addComponent(component, token);
}
const providerToken = randomStringGenerator();