diff --git a/src/environments/environment.ts b/src/environments/environment.ts index aaefbfe6d..10909d23b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr' import { doneITDev } from './suport/doneIt' -export const environment: Environment = doneITDev; \ No newline at end of file +export const environment: Environment = oaprDev; \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 6b4c558b4..b93aaf074 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "b6c9a3147", - "SHA": "b6c9a31477f6adea3821ae91f9e936cc56a6c6ec", + "shortSHA": "976f9cbf2", + "SHA": "976f9cbf2c3bd09c8ab08beb9f4d5044a3709a81", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 6 19:04:26 2023 +0100'", - "lastCommitMessage": "fix time", - "lastCommitNumber": "4748", + "lastCommitTime": "'Tue Feb 7 16:10:11 2023 +0100'", + "lastCommitMessage": "Fix", + "lastCommitNumber": "4749", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pipes/expediente-task.pipe.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/environments/environment.prod.ts", + "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file