From 281dfd6a9777baa79d504f4e88c2d4d92266f08b Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Sat, 24 Oct 2020 04:54:23 +0200
Subject: [PATCH] Fixed weird.

---
 src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml b/src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml
index 0dd08e7..f3c91ab 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml
@@ -47,10 +47,6 @@
 					<td id="fileListLineFilledPropertyCount" class="td_number">n/a</td>
 					<td id="fileListLineBlankPropertyCount" class="td_number">n/a</td>
 					<td id="fileListLineWarningCount" class="td_number"><a id="fileListLineWarningCountLink" href="#">n/a</a></td>
-<<<<<<< HEAD
-=======
-					<td id="fileListLineAlertCount" class="td_number"><a id="fileListLineAlertCountLink" href="#">n/a</a></td>
->>>>>>> branch 'master' of git@forge.devinsy.fr:devinsy/statoolinfos.git
 					<td id="fileListLineErrorCount" class="td_number"><a id="fileListLineErrorCountLink" href="#">n/a</a></td>
 					<td id="fileListLineVoidCount" class="td_number"><a id="fileListLineVoidCountLink" href="#">n/a</a></td>
 					<td id="fileListLineDate" class="td_number">n/a</td>