opt merge

This commit is contained in:
Ivan Office
2025-02-22 02:49:12 +08:00
parent b54ccb58a6
commit e8ca69219f
2 changed files with 0 additions and 8 deletions

View File

@@ -9,11 +9,7 @@
{ {
'name': '2025最新中国会计科目表.企业标准会计.Latest Chinese Accounting for odoo18', 'name': '2025最新中国会计科目表.企业标准会计.Latest Chinese Accounting for odoo18',
<<<<<<< HEAD
'version': '18.0.25.02.17',
=======
'version': '18.0.25.02.18', 'version': '18.0.25.02.18',
>>>>>>> 45755625c75769f05f8e783700c875306e877cc0
'author': 'odooai.cn', 'author': 'odooai.cn',
'category': 'Accounting/Localizations/Account Charts', 'category': 'Accounting/Localizations/Account Charts',
'website': 'https://www.odooai.cn', 'website': 'https://www.odooai.cn',

View File

@@ -17,11 +17,7 @@
<div class="oe_row oe_spaced"> <div class="oe_row oe_spaced">
<div class="row"> <div class="row">
<div class="oe_row"> <div class="oe_row">
<<<<<<< HEAD
<h3>Lastest update: v18.0.25.02.17</h3>
=======
<h3>Lastest update: v18.25.02.18</h3> <h3>Lastest update: v18.25.02.18</h3>
>>>>>>> 45755625c75769f05f8e783700c875306e877cc0
<div class="row"> <div class="row">
<img class="oe_demo oe_screenshot img img-fluid" src="banner.png"> <img class="oe_demo oe_screenshot img img-fluid" src="banner.png">
</div> </div>