Peter bug solved

This commit is contained in:
Eudes Inácio
2023-06-11 11:37:44 +01:00
4 changed files with 18 additions and 45 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "f51c51c00",
"SHA": "f51c51c00535a2bf030861e0c293eff4326113c9",
"shortSHA": "afb8daf18",
"SHA": "afb8daf187ef911f4cd481e38fc8bb51bb1ef62a",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Sat Jun 10 21:16:58 2023 +0100'",
"lastCommitMessage": "pull made",
"lastCommitNumber": "4983",
"lastCommitTime": "'Sun Jun 11 00:07:10 2023 +0100'",
"lastCommitMessage": "changes",
"lastCommitNumber": "4986",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 16 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/beast-orm.ts\n\tmodified: src/app/services/notifications.service.ts",
"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",
"changeAuthor": "eudes.inacio"
}