bus solved

This commit is contained in:
Eudes Inácio
2023-02-14 16:37:33 +01:00
parent a4d7ed01c7
commit 8359af12c9
10 changed files with 17 additions and 15 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "5a90b2125",
"SHA": "5a90b212525d1fdc1cb7df8e13b81fc666fcbe4a",
"shortSHA": "a4d7ed01c",
"SHA": "a4d7ed01c7178781989e066472037f75f7c33036",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Feb 13 19:46:44 2023 +0100'",
"lastCommitMessage": "pull made",
"lastCommitNumber": "4779",
"lastCommitTime": "'Tue Feb 14 10:50:50 2023 +0100'",
"lastCommitMessage": "Peter solved new event action on chat",
"lastCommitNumber": "4782",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 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/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 4 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: src/app/modals/forward/forward.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
"changeAuthor": "eudes.inacio"
}