diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index ce6b84de5..4bfb8db5d 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -15,6 +15,10 @@ export class EventsService { authheader = {}; loggeduser: User; headers: HttpHeaders; +<<<<<<< HEAD +======= + public loadedEvent: Event; //shared var +>>>>>>> pp constructor(private http: HttpClient, user: AuthService) { this.loggeduser = user.ValidatedUser;