Skip to content
Browse files

Resolve merge conflict

  • Loading branch information...
2 parents 4171f90 + 59c89d5 commit cdd08d45133f6a687270d3e5ff3bcf4ce327bfce Tom Dale committed May 30, 2011
Showing with 6 additions and 0 deletions.
  1. +6 −0 js/app.js
View
6 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
}
];

0 comments on commit cdd08d4

Please sign in to comment.
Something went wrong with that request. Please try again.