From 3dfa4c1074df98ffa3d87cfc0df10c5858e84cf2 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 16 Mar 2023 11:03:21 +0100
Subject: [PATCH] fix cont

---
 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 53f31b337..38a854fa6 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 = oaprProd;
\ No newline at end of file
+export const environment: Environment = doneITProd;
\ No newline at end of file
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 8141263a4..2588b107b 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 = oaprDev
\ No newline at end of file
+export const environment: Environment = doneITDev
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index 80c22bbe0..751ec8e4a 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "49d36e252",
-  "SHA": "49d36e25283cf893fc21c4f7e4b7f4bc28ff8494",
+  "shortSHA": "4fe1ca8e1",
+  "SHA": "4fe1ca8e1216f9b24c930341fabca4fe63dd864a",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Mar 16 10:45:05 2023 +0100'",
-  "lastCommitMessage": "upload chat file",
-  "lastCommitNumber": "4871",
+  "lastCommitTime": "'Thu Mar 16 10:46:14 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4877",
   "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/create-process/create-process.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.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/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/services/http-error-handle.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\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": "peter.maquiran"
 }
\ No newline at end of file