diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index e4df8e799..4ef5b9f48 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -45,7 +45,6 @@ export class EventListPage implements OnInit { public eventService: EventsService, ) { this.loggeduser = SessionStore.user; - alert(this.segment) } ngOnInit() { diff --git a/version/git-version.ts b/version/git-version.ts index 922e59ed0..2e18ea10d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9c540d38b", - "SHA": "9c540d38b0e4146fa71545686a971d10951020bf", + "shortSHA": "623df60ae", + "SHA": "623df60aeb62c6830a82deda35294a2fc72907a2", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Feb 22 10:08:50 2023 +0100'", - "lastCommitMessage": "fix eventos", - "lastCommitNumber": "4816", + "lastCommitTime": "'Wed Feb 22 13:06:31 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4817", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/clear-store.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/functions/sort.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts", + "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file