This commit is contained in:
Peter Maquiran
2023-07-21 10:48:26 +01:00
parent 4143a2d007
commit ad722c0fea
3 changed files with 10 additions and 10 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "65a67902d",
"SHA": "65a67902d43d9ee65d9a8b323b926b96a6085904",
"shortSHA": "4143a2d00",
"SHA": "4143a2d00718942f0ca98bd09b0e19b38053266e",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Jul 21 10:12:55 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5088",
"lastCommitTime": "'Fri Jul 21 10:21:10 2023 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "5095",
"change": "",
"changeStatus": "On branch developer-catch-merge\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tnew file: src/assets/images/error_circle_warning.png\n\tmodified: version/git-version.ts",
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
"changeAuthor": "peter.maquiran"
}