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-07-12 10:53:32 +01:00
parent 3f65108fe4 9b690c3848
commit 69c900f5bb
7 changed files with 114 additions and 37 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": "f28e99133",
"SHA": "f28e991338b0829c10b3ac8d8d018b1a05662cc1",
"shortSHA": "3f65108fe",
"SHA": "3f65108fe44450cb4bc334cfdc028bc65e1a35d5",
"branch": "merge-all",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Jul 12 10:44:06 2023 +0100'",
"lastCommitMessage": "update tiny",
"lastCommitNumber": "5058",
"lastCommitTime": "'Wed Jul 12 10:45:49 2023 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "5061",
"change": "",
"changeStatus": "On branch merge-all\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/global.scss\n\tnew file: src/style/ios.scss\n\tmodified: version/git-version.ts",
"changeStatus": "On branch merge-all\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/services/background.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tnew file: src/app/services/logging-interceptor.service.spec.ts\n\tnew file: src/app/services/logging-interceptor.service.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}