From 5ec22d9fadf19a4e79b5caceadc5527b62f7af8d Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 30 Aug 2018 14:25:25 +0200
Subject: [PATCH] Update accountingaccount.class.php

---
 .../class/accountingaccount.class.php         | 37 +++++++------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 08ae8359c96..1447ff0e7b4 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -79,35 +79,24 @@ class AccountingAccount extends CommonObject
 	var $account_number;
 	var $account_parent;
 	var $account_category;
-<<<<<<< HEAD
-	
-	/**
-     	 * @var string proper name for given parameter
+
+    	/**
+     	 * @var string Label of account
      	 */
     	public $label;
-    
-	var $fk_user_author;
-	var $fk_user_modif;
-	var $active;       // duplicate with status
-=======
 
-    /**
-     * @var string Label of account
-     */
-    public $label;
+    	/**
+    	 * @var int ID
+     	 */
+    	public $fk_user_author;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_author;
+    	/**
+     	 * @var int ID
+     	 */
+    	public $fk_user_modif;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
-
-    var $active;       // duplicate with status
->>>>>>> upstream/develop
+    	var $active;       // duplicate with status
+	
 	var $status;