merged OCA#2220 OCA#2230

odoo-italia · Jun 29, 2022 · 2024cf5 · 2024cf5
1 parent 112b529
commit 2024cf5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -58,11 +58,11 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2202/h
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2203/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2205/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2212/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2220/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2220/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2225/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2228/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2229/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2230/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2230/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2234/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2238/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2246/head