From 624d0b1d7a142ec7b58756a9a023a650fdd2e952 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 28 Aug 2023 17:11:29 +0100
Subject: [PATCH] add gitignore

---
 .gitignore             |  3 ++-
 version/git-version.ts | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ecc2ede3e..bc36db74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,4 +95,5 @@ src/app/pipes/process.service.ts
 /.angular
 ./.angular
 src/app/domain
-_src/
\ No newline at end of file
+_src/
+-src
diff --git a/version/git-version.ts b/version/git-version.ts
index c2ad68382..19d9b9143 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "1b897e9c2",
-  "SHA": "1b897e9c2beae44c3c1da51c2e7ffc6e6ca6beaa",
+  "shortSHA": "a426fba4b",
+  "SHA": "a426fba4b3c63c23309cc9d377b733bd4fc775b2",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Aug 28 16:35:47 2023 +0100'",
-  "lastCommitMessage": "improve gitignore",
-  "lastCommitNumber": "5220",
+  "lastCommitTime": "'Mon Aug 28 17:06:16 2023 +0100'",
+  "lastCommitMessage": "merge branch",
+  "lastCommitNumber": "5221",
   "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/add-note/add-note.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts\n\tmodified:   src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified:   src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/publications/publications.page.html\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\nUntracked files:\n  (use \"git add <file>...\" to include in what will be committed)\n\t-src/",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   .gitignore",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file