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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-22 09:18:52 +01:00
parent 7743bdbe74 f6e969b26c
commit 5e069a3783
2 changed files with 8 additions and 6 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": "2ae96bda0",
"SHA": "2ae96bda02a39833995bc6005d5107a70d720b08",
"shortSHA": "7743bdbe7",
"SHA": "7743bdbe743b9bc218b41830448d02e3b63f21a4",
"branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 22 08:35:44 2023 +0100'",
"lastCommitMessage": "fix date picker",
"lastCommitNumber": "5191",
"lastCommitTime": "'Tue Aug 22 09:16:02 2023 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "5196",
"change": "",
"changeStatus": "On branch developer-prod\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/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/assets/images/ministro.png\n\tmodified: src/assets/images/presidente.png",
"changeStatus": "On branch developer-prod\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/header/header.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}