fix merge conflict

templates/site-layout.html

@@ -21,6 +21,7 @@ href="/gutenberg/pg-desktop-one.css?${cherrypy.config['css_mtime']}" />
         href="/gutenberg/new_nav.css?${cherrypy.config['css_mtime']}"/>
     <link rel="stylesheet" type="text/css"
         href="/gutenberg/style.css?${cherrypy.config['css_mtime']}"/>
+
     <!--! IE8 does not recognize application/javascript -->
     <script>//<![CDATA[
       var json_search     = "${os.json_search}";
@@ -57,6 +58,7 @@ href="${os.url_carry (format = 'opds')}" />
     <meta http-equiv="Content-Type"       content="text/html; charset=UTF-8" />
     <meta http-equiv="default-style" content="text/css" />
   
+
     <!--! plain old metadata -->
     <meta name="title"                    content="${os.title}" />
     <meta name="description"              content="${os.description}" />
@@ -118,7 +120,6 @@ title="Powered by PostgreSQL">
 
   <py:def function="site_top">
     <xi:include href="../../menu.html" />
-<!-- <xi:include href="/../gutenbergsite/_includes/menu.html"/>-->
   </py:def>
 
   <py:def function="site_footer">