fix: merge conflict (#1308)

apps/dsp-app/src/app/main/guard/auth.guard.ts

@@ -1,11 +1,6 @@
-import { Injectable } from '@angular/core';
-import {
-    CanActivate,
-    Router,
-} from '@angular/router';
-import { DOCUMENT } from '@angular/common';
 import { ChangeDetectionStrategy, Component, Inject, Injectable } from '@angular/core';
 import { CanActivate, Router } from '@angular/router';
+import { DOCUMENT } from '@angular/common';
 import { Actions, ofActionCompleted, Select, Store } from '@ngxs/store';
 import { Observable } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
@@ -16,7 +11,7 @@ import { CurrentPageSelectors, SetUserAction, UserSelectors } from '@dasch-swiss
 
 
 @Injectable({
-    providedIn: 'root',
+    providedIn: 'root'
 })
 export class AuthGuard implements CanActivate {
 
@@ -29,7 +24,8 @@ export class AuthGuard implements CanActivate {
         private _authService: AuthService,
         private actions$: Actions,
         @Inject(DOCUMENT) private document: Document
-    ) {}
+    ) {
+    }
 
     canActivate(): Observable<boolean> {
         return this.user$.pipe(
@@ -70,7 +66,7 @@ export class AuthGuard implements CanActivate {
 // empty component used as a redirect when the user logs in
 @Component({
     changeDetection: ChangeDetectionStrategy.OnPush,
-    template: '',
+    template: ''
 })
 export class AuthGuardComponent {
     constructor(private router: Router) {