This commit is contained in:
Peter Maquiran
2023-08-09 10:00:39 +01:00
12 changed files with 112 additions and 67 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "95d8bed53",
"SHA": "95d8bed53ddbc022ecb5e0ebb6c5f0b72ee919b6",
"shortSHA": "a2dd41393",
"SHA": "a2dd41393b51e274d2627fa68375cda77266e2c2",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 8 13:43:24 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5140",
"lastCommitTime": "'Tue Aug 8 16:32:57 2023 +0100'",
"lastCommitMessage": "update",
"lastCommitNumber": "5141",
"change": "",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/pages/chat/messages/messages.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts",
"changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/native-notification.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/shared/chat/messages/messages.page.scss\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts\n\tmodified: src/firebase-messaging-sw.js\n\tmodified: src/main.ts",
"changeAuthor": "peter.maquiran"
}