From 2a4a22c1d59ec83d01d2fe500140cbc6dffd5dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 10 Mar 2023 14:45:12 +0100 Subject: [PATCH] enviroment changed --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- version/git-version.ts | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) 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 690a5390c..5c956b66d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "889e38290", - "SHA": "889e3829055600bad6938f6a4826a58ebfb7bfa7", + "shortSHA": "52745817e", + "SHA": "52745817ef92023bca3b7e78d8e2090dfca9d9bd", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Fri Mar 10 09:05:33 2023 +0100'", - "lastCommitMessage": "commit after resolve merge conflit", - "lastCommitNumber": "4860", + "lastCommitTime": "'Fri Mar 10 09:11:13 2023 +0100'", + "lastCommitMessage": "pull made 09:11_10/03/23", + "lastCommitNumber": "4863", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 4 and 2 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)", + "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 3 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\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