peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-06 10:07:37 +01:00
parent 61c0018c5d 72bd8ff8cf
commit 0bcf19ab25
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "6b9c995e3",
"SHA": "6b9c995e31539adabc75487cd3c20143332941be",
"shortSHA": "61c0018c5",
"SHA": "61c0018c5d8d6f71c59b721862c4f1dad06025d0",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Feb 6 09:23:36 2023 +0100'",
"lastCommitMessage": "fix goback",
"lastCommitNumber": "4724",
"lastCommitTime": "'Mon Feb 6 10:04:26 2023 +0100'",
"lastCommitMessage": "improve",
"lastCommitNumber": "4725",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.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/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}