From 883cf1e220e6672d332633d46f4f698d763acb7a Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 27 Apr 2016 12:33:43 +0200
Subject: [PATCH] remove conflict from prev rebase

---
 account_financial_report_qweb/__openerp__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_financial_report_qweb/__openerp__.py b/account_financial_report_qweb/__openerp__.py
index fce27259..bf705ea8 100644
--- a/account_financial_report_qweb/__openerp__.py
+++ b/account_financial_report_qweb/__openerp__.py
@@ -19,6 +19,7 @@
     ],
     'data': [
         'wizard/aged_partner_balance_wizard_view.xml',
+        'wizard/general_ledger_wizard.xml',
         'wizard/ledger_report_wizard_view.xml',
         'wizard/open_invoice_wizard_view.xml',
         'report_menus.xml',
@@ -28,9 +29,9 @@
         'views/report_menus.xml',
         'menuitems.xml',
         'reports.xml',
-        'wizard/general_ledger_wizard.xml',
         # 'wizard/partner_ledger_wizard.xml',
         'report/templates/ledger_general.xml',
+        'report/templates/general_ledger.xml',
     ],
     'test': [
     ],