resolve merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/templates/macros/create_tinysearch_json.html b/templates/macros/create_tinysearch_json.html
index a28d9dc..fcc1f5a 100644
--- a/templates/macros/create_tinysearch_json.html
+++ b/templates/macros/create_tinysearch_json.html
@@ -18,10 +18,10 @@
 {%- if not loop.last -%},{%- endif %}
 {%- endif -%}
 {%- endfor -%}
-{%- if found -%}{%- if section.subsections -%}
+{%- if found and section.subsections -%}
 ,
 {%- for subsection in section.subsections -%}
 {{ self::from_section(section=subsection) }}
 {%- endfor -%}
-{%- endif -%}{%- endif -%}
-{%- endmacro from_section -%}
\ No newline at end of file
+{%- endif -%}
+{%- endmacro from_section -%}