From ee51d785be4bbecfeb585b9a34fb2a79a8ce0116 Mon Sep 17 00:00:00 2001
From: Addy Osmani <addyosmani@gmail.com>
Date: Mon, 29 Jun 2015 15:18:44 +0100
Subject: [PATCH] Resolve further conflicts

---
 docs/_templates/layout.html | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 552a90b8..42c02f88 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -37,7 +37,6 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/0.0.1/prism.min.css">
     <link rel="stylesheet" href="{{page.include_prefix}}material.min.css">
     <link rel="stylesheet" href="{{page.include_prefix}}assets/main.css">
-    <script src="{{page.include_prefix}}material.min.js"></script>
 
     <!-- Fonts -->
     <link href='https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en' rel='stylesheet' type='text/css'>
@@ -108,6 +107,20 @@
     This is a <em>preview</em> of Material Design Lite. It is still very much work-in-progress. We are launching soon!
   </div>
 
+    <!-- IE Compatibility shims -->
+      <!--[if lt IE 9]>
+        <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js""></script>
+      <![endif]-->
+
+      <!--[if IE]>
+        <script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.7/es5-shim.min.js"></script>
+        <script src="//cdnjs.cloudflare.com/ajax/libs/classlist/2014.01.31/classList.min.js"></script>
+        <script src="//cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script>
+        <script src="//cdnjs.cloudflare.com/ajax/libs/flexie/1.0.3/flexie.min.js"></script>
+        <link href="{{page.include_prefix}}assets/ie.css" rel="stylesheet">
+      <![endif]-->
+    <!-- end shims -->
+
     <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -117,6 +130,8 @@
       ga('create', 'UA-XXXXX-X', 'auto');
       ga('send', 'pageview');
     </script>
+    <!-- Material Design Lite -->
+    <script src="{{page.include_prefix}}material.js"></script>
     <!-- Add Copy-to-CodePen buttons to code blocks -->
     <script src="{{page.include_prefix}}assets/codepen.js"></script>
     <!-- Enable Prism syntax highlighting -->