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-01-16 15:47:18 +01:00
parent 12612a3600 d43ce7fe09
commit 3262b6a3a7
6 changed files with 77 additions and 11 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": "7fbe4abdd",
"SHA": "7fbe4abddf5aadf72d781e9c140f6364b5f164e3",
"shortSHA": "12612a360",
"SHA": "12612a360050a996f4b8067694513685280caeac",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Jan 16 09:06:12 2023 +0100'",
"lastCommitMessage": "save",
"lastCommitNumber": "4626",
"lastCommitTime": "'Mon Jan 16 15:45:08 2023 +0100'",
"lastCommitMessage": "fix ui",
"lastCommitNumber": "4627",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/shared/header/header.page.html",
"changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: .gitignore\n\tnew file: android/app/google-services.json\n\tmodified: package.json\n\tmodified: src/app/models/notifications.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}