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

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-21 10:09:36 +01:00
parent 2dea55c7f0 fdce8db602
commit 5497e7ac87
7 changed files with 54 additions and 28 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": "cb0c4459a",
"SHA": "cb0c4459a704510a0666480af4aaf9841079a29c",
"shortSHA": "2dea55c7f",
"SHA": "2dea55c7f06c955eecee3619da88a66d848a9748",
"branch": "developer",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Sun Aug 20 18:09:10 2023 +0100'",
"lastCommitMessage": "update badge das notificações",
"lastCommitNumber": "5178",
"lastCommitTime": "'Sun Aug 20 22:05:46 2023 +0100'",
"lastCommitMessage": "download file chat solved",
"lastCommitNumber": "5179",
"change": "",
"changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 9 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts",
"changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 10 and 5 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/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts",
"changeAuthor": "eudes.inacio"
}