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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-05 15:22:38 +01:00
parent 2b8357cece fc9f39491d
commit 808aec270b
9 changed files with 25 additions and 54 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": "b3356a197",
"SHA": "b3356a197cab868df99b19ca9432e03edbce62a1",
"shortSHA": "2b8357cec",
"SHA": "2b8357ceced749dc0b2fc3b1465029773b7ffc16",
"branch": "feature/agenda-layout",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Mar 31 13:51:17 2023 +0100'",
"lastCommitMessage": "add drop down",
"lastCommitNumber": "4888",
"lastCommitTime": "'Wed Apr 5 15:15:42 2023 +0100'",
"lastCommitMessage": "agenda",
"lastCommitNumber": "4889",
"change": "",
"changeStatus": "On branch feature/agenda-layout\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html",
"changeStatus": "On branch feature/agenda-layout\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: config.xml\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}