Merge branch '14.0-premerge' into 14.0-supermerge

odoo-italia · Sep 3, 2021 · ff37123 · ff37123
2 parents 5d567ac + a3cc42c
commit ff37123
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/supermerge.sh b/supermerge.sh
@@ -59,10 +59,11 @@ rebase_n_merge_pr 2393
 rebase_n_merge_pr 2154
 rebase_n_merge_pr 2043
 rebase_n_merge_pr 2080
-rebase_n_merge_pr 2310 -X theirs
+rebase_n_merge_pr 2310
 rebase_n_merge_pr 2138
 rebase_n_merge_pr 2139
 rebase_n_merge_pr 2149
+rebase_n_merge_pr 2151
 rebase_n_merge_pr 2157
 rebase_n_merge_pr 2198
 rebase_n_merge_pr 2202