commit after resolve merge conflit

src/app/models/beast-orm.ts

@@ -1,5 +1,5 @@
-// import { models } from 'beast-orm'
+import { models } from 'beast-orm'
-import {  models } from 'src/plugin/src'
+/* import {  models } from 'src/plugin/src' */
 import { environment } from 'src/environments/environment'
 const { ArrayField, JsonField}  = models.indexedDB.fields
 

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 <ion-header class="ion-no-border header-2">

src/app/pages/gabinete-digital/despachos/despachos.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 <ion-header class="ion-no-border header-2">

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 <ion-content class="container-wrapper">

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 

src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 

src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border pb-20">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 <ion-content class="container-wrapper">

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 <div class="ion-page d-none" id="main-content">

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 <ion-header class="ion-no-border header-2">

src/app/pages/gabinete-digital/pedidos/pedidos.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 <ion-header class="ion-no-border header-2">

src/app/pages/gabinete-digital/pendentes/pendentes.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header > </app-header>
+  <!-- <app-header > </app-header> -->
 </ion-header>
 
 

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -5,12 +5,9 @@ import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
 import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
-<<<<<<< HEAD
 import { HttpErrorResponse } from '@angular/common/http';
 import { SessionStore } from 'src/app/store/session.service';
 import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page';
-=======
->>>>>>> b8a1734abbbe321eedb202ddde21592f161acf12
 
 
 @Component({

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -126,7 +126,7 @@ export class ViewPublicationsPage implements OnInit {
         const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId )
 
         if(!found) {
-          PublicationModel.create(publicationDetails)
+          /* PublicationModel.create(publicationDetails) */
           this.publicationList[folderId].push(publicationDetails)
         }
       }