peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix pop

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-02 18:44:19 +01:00
parent 9c76f87944
commit 5cef865535
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "8bd135c6f",
"SHA": "8bd135c6f8e5a39afdb3e8bd63f18bc42defd269",
"shortSHA": "9c76f8794",
"SHA": "9c76f87944e7ca245285ab0dd7bb3a05ef9fd758",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Thu Feb 2 18:28:17 2023 +0100'",
"lastCommitMessage": "Git pull made",
"lastCommitNumber": "4715",
"lastCommitTime": "'Thu Feb 2 18:30:30 2023 +0100'",
"lastCommitMessage": "pull made twice",
"lastCommitNumber": "4717",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 1 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: src/app/services/rules/event.service.ts",
"changeAuthor": "eudes.inacio"
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts",
"changeAuthor": "peter.maquiran"
}