fix merge errors

diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index b1e17dd8807fdc51a1793315958c515baebc7a0f..4add929427821718cb7d101161e18de05e08de63 100644 (file)
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,6 +1,6 @@
 <div id="search-form" class="messages info popup-form">
 <form method="get" action="index.php">
-                               <h2>{%trans "Search" %}</h2>
+       <h2>{%trans "Search" %}</h2>
         <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
         <input type="hidden" name="view" value="search"></input>
         <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>