resolve conflicts

[github/wallabag/wallabag.git] / tpl / layout.twig
diff --git a/tpl/layout.twig b/tpl/layout.twig

old mode 100755 (executable)

new mode 100644 (file)

index 7084a21..07ca231
--- a/tpl/layout.twig
+++ b/tpl/layout.twig
@@ -7,7 +7,9 @@
      <head>
          <meta name="viewport" content="initial-scale=1.0">
          <meta charset="utf-8">
+        <!--[if IE]>
          <meta http-equiv="X-UA-Compatible" content="IE=10">
+        <![endif]-->
          <title>{% block title %}{% endblock %} - poche</title>
  {% include '_head.twig' %}
  {% include '_bookmarklet.twig' %}