From 0301192fcaaf9d9725a6fcb15203e4b840df8baf Mon Sep 17 00:00:00 2001
From: Nicolas JEUDY <nicolas.jeudy@myceliandre.fr>
Date: Thu, 28 Sep 2023 09:31:53 +0200
Subject: [PATCH] [FIX] resolv conflict for web repos (PR merged)

---
 odoo/custom/src/repos.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/odoo/custom/src/repos.yaml b/odoo/custom/src/repos.yaml
index e1f2519..93cb5f5 100644
--- a/odoo/custom/src/repos.yaml
+++ b/odoo/custom/src/repos.yaml
@@ -184,8 +184,6 @@
   target: oca 16.0
   merges:
     - oca 16.0
-    - oca refs/pull/2470/head
-    - oca refs/pull/2328/head
 ./mis-builder:
   defaults:
     # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner