Resolve merge conflict

maccman · May 30, 2011 · cdd08d4 · cdd08d4
2 parents 4171f90 + 59c89d5
commit cdd08d4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/js/app.js b/js/app.js
@@ -176,6 +176,12 @@ EveryJS.libraries = [
     website: "http://code.google.com/closure/",
     description: "Closure Tools is a set of open-source JavaScript tools behind some of Google's big web apps like Gmail, Google Maps, and Google Docs.",
     size: "modules can be loaded dynamically"
+  },
+  {
+    name: "Modernizr",
+    website: "http://www.modernizr.com",
+    description: "Modernizr is a JavaScript library that allows you to use CSS3 and HTML5 features while maintaining a fine level of control over browsers that don't support them yet.",
+    size: 3.7
   }
 
 ];