pull made

This commit is contained in:
Eudes Inácio
2023-02-16 15:43:15 +01:00
6 changed files with 36 additions and 17 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "d0db49cdb",
"SHA": "d0db49cdbaaa4a6a011e36b4b4fd910e9c4464af",
"shortSHA": "c0029364c",
"SHA": "c0029364c8429dc183fd6b9743f8f78ab81532f5",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Wed Feb 15 16:26:34 2023 +0100'",
"lastCommitMessage": "added new fecture for presatation day",
"lastCommitNumber": "4788",
"lastCommitTime": "'Wed Feb 15 18:47:55 2023 +0100'",
"lastCommitMessage": "dates on publications solved",
"lastCommitNumber": "4789",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 4 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 5 and 5 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: .husky/pre-commit\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/assets/www/pdfjs/web/viewer.html\n\tmodified: version/git-version.ts",
"changeAuthor": "eudes.inacio"
}