diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 0b10b0992..4c0b85228 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -108,7 +108,7 @@
-
+
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 66fbb19d6..7c151d418 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -129,7 +129,7 @@
- +
diff --git a/version/git-version.ts b/version/git-version.ts index ef0c6423a..f8b898ec7 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "87d8863d7", - "SHA": "87d8863d7dafa4532fa72e06f94188cb9222c34d", + "shortSHA": "39e2f775d", + "SHA": "39e2f775dbd168470f90f68d18c88ffb96ecb910", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Fri Feb 17 12:18:28 2023 +0100'", - "lastCommitMessage": "Verb of the action changed", - "lastCommitNumber": "4796", + "lastCommitTime": "'Fri Feb 17 12:24:25 2023 +0100'", + "lastCommitMessage": "git pull made", + "lastCommitNumber": "4805", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 7 and 8 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/events.service.ts\n\tnew file: src/app/services/notification-message.service.spec.ts\n\tnew file: src/app/services/notification-message.service.ts\n\tnew file: src/app/services/role-id.service.spec.ts\n\tnew file: src/app/services/role-id.service.ts\n\tmodified: src/global.scss", - "changeAuthor": "eudes.inacio" + "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/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html", + "changeAuthor": "peter.maquiran" } \ No newline at end of file