diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index c6f63a9d0..676f22833 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -8,7 +8,7 @@ - +
@@ -78,20 +78,8 @@
- - Oficial - Pessoal - - - + Oficial @@ -114,19 +102,8 @@
- - Reunião - Viagem - Conferência - Encontro - - - + @@ -144,7 +121,6 @@ -
@@ -155,17 +131,8 @@
- - - +
- - - +
-<<<<<<< HEAD - -======= ->>>>>>> develop_bitOut-fix
- - - - { @@ -374,7 +378,6 @@ export class DocumentSetUpMeetingPage implements OnInit { modal.onDidDismiss().then((res)=> { if(res){ const data = res.data; - console.log('data', data) this.attachments.push(data.selected); } }); diff --git a/version/git-version.ts b/version/git-version.ts index f7083e475..10972fa7b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "79b8b28ce", - "SHA": "79b8b28ce4be6d579994bd7b15b8137807223be9", + "shortSHA": "092f5f7f6", + "SHA": "092f5f7f6feec5064a7eb8c538d3e0a072bd602b", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 6 10:49:58 2023 +0100'", - "lastCommitMessage": "Evento to approve", - "lastCommitNumber": "4729", + "lastCommitTime": "'Mon Feb 6 10:55:44 2023 +0100'", + "lastCommitMessage": "improve message", + "lastCommitNumber": "4730", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file