From e8ca69219f89bd5fbeb4f4ea6353429971f02ce0 Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Sat, 22 Feb 2025 02:49:12 +0800
Subject: [PATCH] opt merge

---
 l10n_cn_standard_latest/__manifest__.py               | 4 ----
 l10n_cn_standard_latest/static/description/index.html | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/l10n_cn_standard_latest/__manifest__.py b/l10n_cn_standard_latest/__manifest__.py
index cfb4b39e..b1d88ea6 100644
--- a/l10n_cn_standard_latest/__manifest__.py
+++ b/l10n_cn_standard_latest/__manifest__.py
@@ -9,11 +9,7 @@
 
 {
     'name': '2025最新中国会计科目表.企业标准会计.Latest Chinese Accounting for odoo18',
-<<<<<<< HEAD
-    'version': '18.0.25.02.17',
-=======
     'version': '18.0.25.02.18',
->>>>>>> 45755625c75769f05f8e783700c875306e877cc0
     'author': 'odooai.cn',
     'category': 'Accounting/Localizations/Account Charts',
     'website': 'https://www.odooai.cn',
diff --git a/l10n_cn_standard_latest/static/description/index.html b/l10n_cn_standard_latest/static/description/index.html
index ecd9e10d..44eacb81 100644
--- a/l10n_cn_standard_latest/static/description/index.html
+++ b/l10n_cn_standard_latest/static/description/index.html
@@ -17,11 +17,7 @@
     <div class="oe_row oe_spaced">
         <div class="row">
             <div class="oe_row">
-<<<<<<< HEAD
-                <h3>Lastest update: v18.0.25.02.17</h3>
-=======
                 <h3>Lastest update: v18.25.02.18</h3>
->>>>>>> 45755625c75769f05f8e783700c875306e877cc0
                 <div class="row">
                     <img class="oe_demo oe_screenshot img img-fluid" src="banner.png">
                 </div>