merged OCA#1938 OCA#1942

odoo-italia · Jul 30, 2021 · 0556ae3 · 0556ae3
1 parent 48d7dbd
commit 0556ae3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/supermerge.sh b/supermerge.sh
@@ -18,10 +18,10 @@ git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1929/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1930/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1931/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1938/head
+# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1938/head
 # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1939/head
-git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/head
-git pull --no-ff --no-edit --quiet https://github.com/fredzamoabg/l10n-italy pull/2/head
+# merged # 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/2/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
 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1973/head