From 4f90a66493b84e3b8d78ff48c1c305531a9a9db2 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sun, 11 Jun 2023 20:25:07 +0100 Subject: [PATCH] remove text --- .../gabinete-digital/gabinete-digital.page.html | 1 - src/environments/environment.ts | 2 +- version/git-version.ts | 12 ++++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 28af2ace6..6eaeffe2d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -439,7 +439,6 @@ - {{ selectedElement }}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts index e2d79dff9..16a865ce9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = oaprDev \ No newline at end of file +export const environment: Environment = DevDev \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index a933da115..d4af11187 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "72f396a3b", - "SHA": "72f396a3b93a365f5f7738b5f2eb9b9f6fd3cfe0", + "shortSHA": "332125e40", + "SHA": "332125e40f2d7924e5869cfa78ea3d2924fad882", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sun Jun 11 20:18:21 2023 +0100'", - "lastCommitMessage": "remove code", - "lastCommitNumber": "4978", + "lastCommitTime": "'Sun Jun 11 20:20:24 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "5000", "change": "", - "changeStatus": "On branch feature/gabinete-search\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/events/attendees/attendees.page.html\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/environments/environment.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file