statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Merge branch 'master' of git@forge.devinsy.fr:devinsy/statoolinfos.git

Browse source 
Conflicts:
	src/fr/devinsy/statoolinfos/htmlize/PropertiesFilesPage.java
	src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml
This commit is contained in:
Christian P. MOMON 2020-10-24 04:52:45 +02:00
commit b641d6e54e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml
View file

@ -47,6 +47,10 @@
<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>