fix conflict

2018-09-01 22:42:42 +02:00 · 2018-09-01 22:42:42 +02:00 · 091b8269a6
commit 091b8269a6
parent 5d273960dc df4a4aa6c9
1 changed files with 0 additions and 1 deletions
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@ -99,7 +99,6 @@ class AccountingAccount extends CommonObject
    var $active;       // duplicate with status


-
 	/**
 	 * Constructor
 	 *