Merge branch 'master' of https://bitbucket.org/equilibriumito/gabinete-digital

src/app/services/events.service.ts

@@ -15,10 +15,7 @@ export class EventsService {
   authheader = {};
   loggeduser: User;
   headers: HttpHeaders;
-<<<<<<< HEAD
-=======
-  public loadedEvent: Event; //shared var
->>>>>>> pp
+  public loadedEvent: Event;
 
   constructor(private http: HttpClient, user: AuthService) { 
     this.loggeduser = user.ValidatedUser;