Skip to content

Commit bc68f47

Browse files
committed
fixup
1 parent b21e600 commit bc68f47

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ odoo_version: 18.0
1818
org_name: Odoo Community Association (OCA)
1919
org_slug: OCA
2020
rebel_module_groups:
21-
- product_logistics_uom
21+
- product_logistics_uom,product_packaging_dimension
2222
repo_description: product-attribute
2323
repo_name: product-attribute
2424
repo_slug: product-attribute

.github/workflows/test.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,34 @@ jobs:
3636
matrix:
3737
include:
3838
- container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest
39-
include: "product_logistics_uom"
39+
include: "product_logistics_uom,product_packaging_dimension"
4040
name: test with Odoo
4141
- container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest
42-
include: "product_logistics_uom"
42+
include: "product_logistics_uom,product_packaging_dimension"
4343
name: test with OCB
4444
makepot: "true"
4545
- container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest
46+
<<<<<<< before updating
4647
exclude: "product_logistics_uom"
4748
name: test with Odoo exclude
49+
||||||| last update
50+
exclude: "product_logistics_uom"
51+
name: test with Odoo
52+
=======
53+
exclude: "product_logistics_uom,product_packaging_dimension"
54+
name: test with Odoo
55+
>>>>>>> after updating
4856
- container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest
57+
<<<<<<< before updating
4958
exclude: "product_logistics_uom"
5059
name: test with OCB exclude
60+
||||||| last update
61+
exclude: "product_logistics_uom"
62+
name: test with OCB
63+
=======
64+
exclude: "product_logistics_uom,product_packaging_dimension"
65+
name: test with OCB
66+
>>>>>>> after updating
5167
makepot: "true"
5268
services:
5369
postgres:

product_logistics_uom/__manifest__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"depends": [
1515
"product",
1616
],
17-
"excludes": [
18-
"product_dimension",
19-
],
2017
"data": [
2118
"views/res_config_settings.xml",
2219
"views/product.xml",

0 commit comments

Comments
 (0)