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

solved

Browse Source
This commit is contained in:
Eudes Inácio
2023-06-11 12:23:21 +01:00
parent 6334142ab9 223eae1a83
commit 1a64e616a3
5 changed files with 17 additions and 11 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": "afb8daf18",
"SHA": "afb8daf187ef911f4cd481e38fc8bb51bb1ef62a",
"shortSHA": "6334142ab",
"SHA": "6334142ab9027310ea080e64e7d1b0dfd6a63ac9",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Sun Jun 11 00:07:10 2023 +0100'",
"lastCommitMessage": "changes",
"lastCommitNumber": "4986",
"lastCommitTime": "'Sun Jun 11 11:37:44 2023 +0100'",
"lastCommitMessage": "Peter bug solved",
"lastCommitNumber": "4988",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 17 and 3 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/models/beast-orm.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 18 and 3 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: .gitignore\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts",
"changeAuthor": "eudes.inacio"
}