From 5a90b212525d1fdc1cb7df8e13b81fc666fcbe4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eudes=20In=C3=A1cio?= <eudes.inacio@equilibrium.local>
Date: Mon, 13 Feb 2023 19:46:44 +0100
Subject: [PATCH] pull made

---
 src/environments/environment.prod.ts |  2 +-
 src/environments/environment.ts      |  2 +-
 version/git-version.ts               | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 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 0fd6e82ab..5fdb95c68 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "b1160a179",
-  "SHA": "b1160a179cd14a4f291f872e1144ffad74215b9c",
+  "shortSHA": "b21a3350e",
+  "SHA": "b21a3350ec5135e0be63566be04f5599127044fd",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 13 19:34:00 2023 +0100'",
-  "lastCommitMessage": "plura worlds",
-  "lastCommitNumber": "4775",
+  "lastCommitTime": "'Mon Feb 13 19:35:16 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4778",
   "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/modals/add-note/add-note.page.html\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   version/git-version.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 <file>...\" to unstage)\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts",
+  "changeAuthor": "eudes.inacio"
 }
\ No newline at end of file