Merge branch 'master' of git@forge.devinsy.fr:devinsy/statoolinfos.git
Conflicts: src/fr/devinsy/statoolinfos/htmlize/PropertiesFilesPage.java src/fr/devinsy/statoolinfos/htmlize/propertiesFiles.xhtml
This commit is contained in:
commit
b641d6e54e
1 changed files with 4 additions and 0 deletions
|
@ -47,6 +47,10 @@
|
||||||
<td id="fileListLineFilledPropertyCount" class="td_number">n/a</td>
|
<td id="fileListLineFilledPropertyCount" class="td_number">n/a</td>
|
||||||
<td id="fileListLineBlankPropertyCount" 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>
|
<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="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="fileListLineVoidCount" class="td_number"><a id="fileListLineVoidCountLink" href="#">n/a</a></td>
|
||||||
<td id="fileListLineDate" class="td_number">n/a</td>
|
<td id="fileListLineDate" class="td_number">n/a</td>
|
||||||
|
|
Loading…
Reference in a new issue