merged OCA#2309 OCA#2373 OCA#2388 OCA#2203 OCA#2238

odoo-italia · Oct 15, 2021 · 1dcd5b2 · 1dcd5b2
1 parent 6184191
commit 1dcd5b2
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -34,15 +34,12 @@ set -xe
 rebase_n_merge https://github.com/odoo-italia/l10n-italy 14.0-premerge 14.0-premerge
 # fixes
 # rebase_n_merge_pr 2285
-rebase_n_merge_pr 2309
 rebase_n_merge_pr 2327
 rebase_n_merge_pr 2344
 rebase_n_merge_pr 2346
 #rebase_n_merge_pr 2360
 rebase_n_merge_pr 2364
 rebase_n_merge_pr 2369
-rebase_n_merge_pr 2373
-rebase_n_merge_pr 2388
 rebase_n_merge_pr 2392
 rebase_n_merge_pr 2425
 rebase_n_merge_pr 2430
@@ -58,11 +55,9 @@ rebase_n_merge_pr 2151
 rebase_n_merge_pr 2157
 rebase_n_merge_pr 2198
 rebase_n_merge_pr 2202
-rebase_n_merge_pr 2203
 rebase_n_merge_pr 2212
 rebase_n_merge_pr 2228
 rebase_n_merge_pr 2229
-rebase_n_merge_pr 2238
 rebase_n_merge_pr 2258
 rebase_n_merge_pr 2259
 rebase_n_merge_pr 2315