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

git pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-07-26 14:12:23 +01:00
parent 4109e30d07 9e8bb92b96
commit 299d46f781
11 changed files with 201 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "54a6fb5b6",
"SHA": "54a6fb5b6eb5d1afc53a6067dfd64519c3c3fa87",
"shortSHA": "4109e30d0",
"SHA": "4109e30d0772063fe33a0d1313dda48a2f1d808c",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Jul 24 13:52:48 2023 +0100'",
"lastCommitMessage": "change",
"lastCommitNumber": "5107",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Wed Jul 26 09:47:31 2023 +0100'",
"lastCommitMessage": "Notification stop duplication",
"lastCommitNumber": "5108",
"change": "",
"changeStatus": "On branch developer-catch-merge\nYour branch is behind 'origin/developer-catch-merge' by 3 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/services/notifications.service.ts",
"changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 1 and 4 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/create-process/create-process.page.ts\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/models/Excludetask.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts",
"changeAuthor": "eudes.inacio"
}