[FIX] resolv conflict for web repos (PR merged)

1 year ago · 0301192fca
1 changed files with 0 additions and 2 deletions
--- 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