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

onother merger made

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-06 10:11:49 +01:00
parent fa13f52800 0bcf19ab25
commit 3a23b65543
11 changed files with 36 additions and 21 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": "72bd8ff8c",
"SHA": "72bd8ff8cf78537c976def8a535e32e8cfa76d50",
"shortSHA": "fa13f5280",
"SHA": "fa13f528006c76a2545adc0cd721caf282fa519b",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Feb 6 09:45:44 2023 +0100'",
"lastCommitMessage": "pull made",
"lastCommitNumber": "4725",
"lastCommitTime": "'Mon Feb 6 10:10:32 2023 +0100'",
"lastCommitMessage": "git version",
"lastCommitNumber": "4726",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 3 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: version/git-version.ts",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: angular.json\n\tmodified: package.json\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tnew file: src/combined-sw.js\n\trenamed: src/assets/firebase-messaging-sw.js -> src/firebase-messaging-sw.js\n\tnew file: src/manifest.webmanifest",
"changeAuthor": "eudes.inacio"
}