resolved a merge conflict

6 years ago · 76deb8ad35
1 changed files with 2 additions and 2 deletions
--- a/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
@ -25,9 +25,9 @@ export abstract class AuthFlowStrategy {
  };

  constructor(protected injector: Injector) {
-    this.oAuthService = injector.get(OAuthService);
    this.store = injector.get(Store);
-    this.oAuthConfig = this.store.selectSnapshot(ConfigState.getDeep('environment.oAuthConfig'));
+    this.oAuthService = injector.get(OAuthService);
+    this.oAuthConfig = injector.get(Store).selectSnapshot(ConfigState.getDeep('environment.oAuthConfig'));
  }

  async init(): Promise<any> {