diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 38a854fa6..53f31b337 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr' import { doneITProd } from './suport/doneIt' -export const environment: Environment = doneITProd; \ No newline at end of file +export const environment: Environment = oaprProd; \ No newline at end of file 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 d64c17b89..a15a44925 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "3fd2803a3", - "SHA": "3fd2803a3b3d92fdbcf66863b580d74e6e284b69", + "shortSHA": "2d0f23749", + "SHA": "2d0f23749c63c3599eb3bed52d82f44746588edb", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 6 17:54:06 2023 +0100'", - "lastCommitMessage": "time", - "lastCommitNumber": "4741", + "lastCommitTime": "'Mon Feb 6 17:58:02 2023 +0100'", + "lastCommitMessage": "fix merge", + "lastCommitNumber": "4744", "change": "", - "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/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts", - "changeAuthor": "peter.maquiran" + "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", + "changeAuthor": "eudes.inacio" } \ No newline at end of file