merge made

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -42,22 +42,6 @@ export class ExpedientePage implements OnInit {
     this.getEventsFromLocalDb();
     console.log("segrsgre")
 
-<<<<<<< HEAD
-   
-      this.LoadList()
-
-      this.router.events.forEach((event) => {
-        if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
-          if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
-            this.refreshing()
-          } else {
-            this.LoadList()
-          }
-        }
-      });
-
-=======
->>>>>>> branchBug
   }
 
   async LoadList() {