From 978abf96a32d2e7e14e58e20535a16dfee829e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?=
 <stephane.bidoul@acsone.eu>
Date: Wed, 31 Oct 2018 17:05:24 +0100
Subject: [PATCH] [IMP] asset mgt: use exclude manifest key

This is now supported natively by Odoo 11.
---
 account_asset_management/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_asset_management/__manifest__.py b/account_asset_management/__manifest__.py
index a59c4cac1..080336d41 100644
--- a/account_asset_management/__manifest__.py
+++ b/account_asset_management/__manifest__.py
@@ -8,7 +8,7 @@
     'depends': [
         'account_fiscal_year',
     ],
-    'conflicts': ['account_asset'],
+    'excludes': ['account_asset'],
     'author': "Noviat,Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/account-financial-tools',
     'category': 'Accounting & Finance',