Merge conflict

Author: Miel Vander Sande

src/main/resources/views/fragment.ftl.html

@@ -36,9 +36,9 @@ <h3>Matches in ${datasource.getTitle()} for <em class="pattern">${ (query.getPat
   <@pageLinks/>
 <#else>
   <p>
-    <%= datasource.getTitle() %> contains
+    ${datasource.getTitle()} contains
     <span property="void:triples hydra:totalItems" datatype="xsd:integer" content="0">
-      no <#if (totalEstimate > 0)>more</#if>
+      no <#if (totalEstimate > 0) >more</#if>
     </span>
     triples that match this pattern.
   </p>
@@ -80,4 +80,4 @@ <h3>Matches in ${datasource.getTitle()} for <em class="pattern">${ (query.getPat
    <li><a href="${ nextPage }" rel="next" property="hydra:nextPage">next</a></li>
    </#if>
  </ul>
-</#macro>
+</#macro>