This commit is contained in:
Peter Maquiran
2023-08-08 13:43:24 +01:00
9 changed files with 227 additions and 49 deletions
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "67a69d2e4",
"SHA": "67a69d2e4724ac828c2c0e09649b593ca6a2d021",
"shortSHA": "d2f1aa194",
"SHA": "d2f1aa194924a7b7bfe26812b7c71bbf8c009108",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 8 09:43:26 2023 +0100'",
"lastCommitTime": "'Tue Aug 8 13:38:50 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5128",
"lastCommitNumber": "5129",
"change": "",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/chat/chat.page.scss\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/global.scss",
"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/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}