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-24 15:46:10 +01:00
parent 5733874d5f 6e800ab7c8
commit 8bea27857e
10 changed files with 36 additions and 50 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": "16e908709",
"SHA": "16e90870988f16410f86e49b4783850132982004",
"shortSHA": "5733874d5",
"SHA": "5733874d5fb6301eedde143e28a046e3810c2317",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Jan 23 15:24:35 2023 +0100'",
"lastCommitMessage": "hot fix",
"lastCommitNumber": "4680",
"lastCommitTime": "'Tue Jan 24 14:31:05 2023 +0100'",
"lastCommitMessage": "fixe",
"lastCommitNumber": "4681",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/search.service.ts\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: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.prod.ts",
"changeAuthor": "peter.maquiran"
}