Skip to content

Commit 0492cd5

Browse files
committed
1 parent 4b087ec commit 0492cd5

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

supermerge.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/h
2424
git pull --no-ff --no-edit --quiet https://github.com/fredzamoabg/l10n-italy pull/2/head
2525
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1950/head
2626
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1959/head
27-
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1962/head
2827
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1973/head
2928
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1974/head
3029
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1975/head
@@ -37,11 +36,10 @@ git pull --no-ff --no-edit --quiet -X theirs https://github.com/OCA/l10n-italy p
3736
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2043/head
3837
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2044/head
3938
# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2079/head
40-
#
41-
# NOTA: entrambi portano l10n_it_fatturapa_export_zip - sceglierne uno (finché non sono integrati)
4239
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2080/head
43-
#git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.0-mig-l10n_it_fatturapa_export_zip
44-
#
4540
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2128/head
46-
git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.0-mig-l10n_it_ricevute_bancarie
41+
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2138/head
42+
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2139/head
43+
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2140/head
44+
git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2141/head
4745
git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.0-mig-l10n_it_fatturapa_import_zip

0 commit comments

Comments
 (0)