This commit is contained in:
Peter Maquiran
2023-02-06 17:54:06 +01:00
parent 18b647e702
commit 3fd2803a3b
8 changed files with 21 additions and 19 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "98f543772",
"SHA": "98f543772e82b240d4c2b05f81d7be2d66118715",
"shortSHA": "18b647e70",
"SHA": "18b647e7023b6fc305dcb61cd06b6ad871eebaf8",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Feb 6 16:30:11 2023 +0100'",
"lastCommitMessage": "set time by default and round number to 15",
"lastCommitNumber": "4735",
"lastCommitTime": "'Mon Feb 6 16:31:55 2023 +0100'",
"lastCommitMessage": "fix merge",
"lastCommitNumber": "4740",
"change": "",
"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/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/notifications.service.ts",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts",
"changeAuthor": "peter.maquiran"
}