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 ee55c1414..e2d79dff9 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 = 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 592f8fbb4..884f17fe8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "451718422", - "SHA": "451718422ae2a7af56811aae07842f491b0444c3", + "shortSHA": "6f2f77db6", + "SHA": "6f2f77db65811c219106a717aaf5f88d5c1f0c11", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Thu May 25 16:41:39 2023 +0100'", - "lastCommitMessage": "changes", - "lastCommitNumber": "4943", + "lastCommitTime": "'Fri May 26 10:24:58 2023 +0100'", + "lastCommitMessage": "expediente bug solved by peter", + "lastCommitNumber": "4945", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 2 and 1 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: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/services/events.service.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch is ahead of 'origin/feature/gabinete-search' by 3 commits.\n (use \"git push\" to publish your local commits)\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