fix: Add return true to Chip onRemove handlers and resolve conflicts

2025-10-13 08:11:00 +00:00
parent 139a2357f4 5ed9a80339
commit 62e7e32fac
38 changed files with 10116 additions and 383 deletions
--- a/app/(main)/chantiers/[id]/execution-granulaire/page.tsx
+++ b/app/(main)/chantiers/[id]/execution-granulaire/page.tsx
@@ -560,4 +560,8 @@ const ExecutionGranulaireChantier = () => {
    );
 };

+<<<<<<< HEAD
 export default ExecutionGranulaireChantier;
+=======
+export default ExecutionGranulaireChantier;
+>>>>>>> 5ed9a80339c59d689b9655e8be1a68312d19d4a1