change OCA#1959 to OCA#2234, merge OCA#1974 OCA#1975

odoo-italia · Apr 23, 2021 · 3c59b72 · 3c59b72
1 parent 440c053
commit 3c59b72
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -23,10 +23,10 @@ git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/fredzamoabg/l10n-italy pull/5/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1950/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1959/head
+# closed, see #2234 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1959/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1973/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1974/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1975/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1974/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1975/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1984/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1985/head
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2154/head
@@ -60,3 +60,4 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2225/h
 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
+git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2234/head