From 43b93d62d5275c917c451a6d164503e10e68f86b Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Fri, 19 Mar 2021 11:44:58 +0100 Subject: [PATCH] merged #1938 #1942 --- supermerge.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/supermerge.sh b/supermerge.sh index 552605475bdd..165651420f9d 100644 --- 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