mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix errors on branch
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user