Hi Alexandra,


Alexandra Yates wrote:
> After tunning the sistem the Software Setings in Need of Tunning table
> appreared empty. Added a conditional statement to print the table only
> when there are software settings  in need of tunning.
>
> Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com>
> ---
>   src/tuning/tuning.cpp |   65 ++++++++++++++++++++++++++-----------------------
>   1 file changed, 35 insertions(+), 30 deletions(-)
>
> diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp
> index ac479a2..67d604f 100644
> --- a/src/tuning/tuning.cpp
> +++ b/src/tuning/tuning.cpp
...
> @@ -257,12 +267,7 @@ void report_show_tunables(void)
>   		untunable_data[i+1]= string(all_untunables[i]->description());
>   
>   	/* Report Output */
> -<<<<<<< HEAD
> -	report.add_div(&div_attr);
>   	report.add_title(&title_attr,__("Untunable Software Issues"));
> -=======
> -	report.add_title(&title_attr,"Untunable Software Issues");
> ->>>>>>> 4d9b82e... report-html: fixed not hidding sections errors
>   	report.add_table(untunable_data, &tune_table_css);

Here is some garbage after merge.

>   
>   	/* Third Table */

-- 
Best regards,
Igor Zhbanov,
Expert Software Engineer,
phone: +7 (495) 797 25 00 ext 3981
e-mail: i.zhbanov(a)samsung.com

Mobile group, Moscow R&D center, Samsung Electronics
12 Dvintsev street, building 1
127018, Moscow, Russian Federation