From a16fa645963499d4127f0b91af11c3c4218431c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Jan 2021 11:42:54 +0100
Subject: [PATCH] Fix merge

---
 .../accountancy/bookkeeping/listbysubaccount.php  | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 4800fb779c6..04b59fc7816 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -724,21 +724,6 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
-<<<<<<< HEAD
-	// Piece number
-	if (!empty($arrayfields['t.piece_num']['checked'])) {
-		print '<td>';
-		$object->id = $line->id;
-		$object->piece_num = $line->piece_num;
-		print $object->getNomUrl(1, '', 0, '', 1);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-=======
->>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
 	// Document ref
 	if (!empty($arrayfields['t.doc_ref']['checked'])) {
 		if ($line->doc_type == 'customer_invoice') {