fix errors on branch

This commit is contained in:
Paulo Pinto
2020-08-25 13:36:55 +01:00
+4
View File
@@ -15,6 +15,10 @@ export class EventsService {
authheader = {}; authheader = {};
loggeduser: User; loggeduser: User;
headers: HttpHeaders; headers: HttpHeaders;
<<<<<<< HEAD
=======
public loadedEvent: Event; //shared var
>>>>>>> pp
constructor(private http: HttpClient, user: AuthService) { constructor(private http: HttpClient, user: AuthService) {
this.loggeduser = user.ValidatedUser; this.loggeduser = user.ValidatedUser;