From ba2e265d2e5adb8a08d090fa7aae651939634bf8 Mon Sep 17 00:00:00 2001
From: Julien Ortet <julien@le-filament.com>
Date: Wed, 27 Mar 2024 10:52:02 +0100
Subject: [PATCH] [FIX] typo in security file

---
 security/ir.model.access.csv | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 9bf8918..d2f220c 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -1,8 +1,4 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-<<<<<<< HEAD
 "access_acc_repartition_keys_group_operation_superadmin","acc_repartition_keys group_operation_superadmin","model_acc_repartition_keys","oacc.group_operation_superadmin",1,1,1,0
 "access_acc_repartition_keys_wizard_group_operation_superadmin","acc_repartition_keys_wizard group_operation_superadmin","model_acc_repartition_keys_wizard","oacc.group_operation_superadmin",1,1,1,1
-=======
-"access_acc_repartition_keys_group_operation_admin","acc_repartition_keys group_operation_admin","model_acc_repartition_keys","oacc.group_operation_admin",1,1,1,0
-"access_acc_repartition_keys_wizard_group_operation_admin","acc_repartition_keys_wizard group_operation_admin","model_acc_repartition_keys_wizard","oacc.group_operation_admin",1,1,1,1
->>>>>>> 4dfd18c5a4bb5d0890560e5c5f26b9d44b9bea42
+
-- 
GitLab