tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7137-error-en-merge-reporting-builder-y-policy-agents' into 'develop'

Browse Source 
resolved merge conflict

See merge request artica/pandorafms!3900
This commit is contained in:
Daniel Rodriguez 2021-03-16 11:52:55 +00:00
commit f880e0632d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2763,17 +2763,13 @@ $class = 'databox filters';
</td> </td>
</tr> </tr>
<<<<<<< HEAD <tr id="row_summary"class="datos">
<tr id="row_filter_search" class="datos"> <td class="bolder">
<td class="bolder"><?php echo __('Free search'); ?></td>
=======
<tr id="row_summary" style="" class="datos">
<td style="font-weight:bold;">
<?php <?php
echo __('Summary'); echo __('Summary');
?> ?>
</td> </td>
<td style=""> <td>
<?php <?php
html_print_checkbox_switch( html_print_checkbox_switch(
'summary', 'summary',
@ -2788,9 +2784,8 @@ $class = 'databox filters';
</td> </td>
</tr> </tr>
<tr id="row_filter_search" style="" class="datos"> <tr id="row_filter_search" class="datos">
<td style="font-weight:bold;"><?php echo __('Include filter'); ?></td> <td class="bolder"><?php echo __('Include filter'); ?></td>
>>>>>>> origin/develop
<td> <td>
<?php <?php
html_print_input_text('filter_search', $filter_search); html_print_input_text('filter_search', $filter_search);