diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 8370d3e33..37809c9ec 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -54,10 +54,7 @@ export class GabineteDigitalPage implements OnInit {
   showEventsToApprove = false;
   showEmptyContainer = false;
   showExpedients = false;
-<<<<<<< HEAD
   showExpedientesPr = false;
-=======
->>>>>>> f7eaca61e7eb3f287c9ce200e1f3654d3ac0ebff
   showPedidos = false;
   showDespachos = false;
   showDespachosPr = false;