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 of peter changes 3

Browse Source
This commit is contained in:
Eudes Inácio
2023-01-19 10:29:34 +01:00
parent 7b97a79e3c 7851c5a78e
commit 706729155c
6 changed files with 134 additions and 123 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": "e9de468b9",
"SHA": "e9de468b9b5dfd61c4b34a30e59de77c2a432953",
"shortSHA": "7b97a79e3",
"SHA": "7b97a79e3c16ea1794a9cb22c8c74f9d95affda8",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Thu Jan 19 09:51:21 2023 +0100'",
"lastCommitMessage": "pull of Peter changes",
"lastCommitNumber": "4657",
"lastCommitTime": "'Thu Jan 19 10:24:18 2023 +0100'",
"lastCommitMessage": "pull of peter changes 2",
"lastCommitNumber": "4660",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 2 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/shared/gabinete-digital/all-processes/all-processes.page.ts",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 4 and 2 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/guards/login.guard.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tnew file: tsconfig.worker.json",
"changeAuthor": "eudes.inacio"
}