diff --git a/app/frontend/templates/panel/config_json.html b/app/frontend/templates/panel/config_json.html index c9856cce..70daa503 100644 --- a/app/frontend/templates/panel/config_json.html +++ b/app/frontend/templates/panel/config_json.html @@ -46,35 +46,43 @@ {% if isinstance(item[1], list) %} -
- - {% elif isinstance(item[1], bool) %} + <<<<<<< HEAD
+ + ======= + + >>>>>>> 99ccfb222840ed1c7d871763887d7108e178710d + {% elif isinstance(item[1], bool) %} - {% if item[1] == True %} -
- -  
- -   -
- {% else %} -
- -  
- -   -
- {% end %} - {% elif isinstance(item[1], int) %} - - {% else %} - - {% end %} - {% end %} - + {% if item[1] == True %} +
+ +  
+ +   +
+ {% else %} +
+ +  
+ +   +
+ {% end %} + {% elif isinstance(item[1], int) %} + + {% else %} + + {% end %} + {% end %} +