From cf616a845bb7b5d8da528af7b0862618cf9620f9 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Thu, 3 Apr 2014 08:49:34 +0200 Subject: [PATCH] Do not require modernizr. Conflicts: app/assets/javascripts/main.js.coffee --- app/assets/javascripts/application.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f69b750bb6..bc65b50526 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,7 +18,6 @@ //= require turbolinks //= require jquery.turbolinks //= require bootstrap -//= require modernizr //= require select2 //= require raphael //= require g.raphael-min