merged OCA#2205, OCA#2246; new OCA#2278

odoo-italia · Jun 6, 2021 · 2dd6e27 · 2dd6e27
1 parent 37e650d
commit 2dd6e27
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -55,7 +55,7 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2198/h
 # closed, see #2230 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2199/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2202/head
 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
+# merged # 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
 # 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
@@ -64,11 +64,12 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2229/h
 # 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
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2246/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2248/head
 #git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2258/head
 # closed, see #2258 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2166/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2166/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2259/head
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2278/head
 git pull --no-ff --no-edit --quiet https://github.com/OmniaGit/l10n-italy 14.0-mig-l10n_it_location_nuts