From 09e94bd0e9acf7cbad8cfd548089a60a50907d4f Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Mon, 15 Mar 2021 11:43:36 +0100
Subject: [PATCH] resolved merge conflict

---
 .../reporting/reporting_builder.item_editor.php   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 298e36aa25..0a6c53d766 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -2763,17 +2763,13 @@ $class = 'databox filters';
             </td>
         </tr>
 
-<<<<<<< HEAD
-        <tr id="row_filter_search"   class="datos">
-            <td class="bolder"><?php echo __('Free search'); ?></td>
-=======
-        <tr id="row_summary" style="" class="datos">
-            <td style="font-weight:bold;">
+        <tr id="row_summary"class="datos">
+            <td class="bolder">
             <?php
             echo __('Summary');
             ?>
             </td>
-            <td style="">
+            <td>
             <?php
             html_print_checkbox_switch(
                 'summary',
@@ -2788,9 +2784,8 @@ $class = 'databox filters';
             </td>
         </tr>
 
-        <tr id="row_filter_search" style="" class="datos">
-            <td style="font-weight:bold;"><?php echo __('Include filter'); ?></td>
->>>>>>> origin/develop
+        <tr id="row_filter_search" class="datos">
+            <td class="bolder"><?php echo __('Include filter'); ?></td>
             <td>
                 <?php
                 html_print_input_text('filter_search', $filter_search);