Merge branch 'master' into notes

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6ee15af5b8d98f8e559e674a3952123a0d24cc4d..c52c072a754fa941a33b61b920aebe96e7b3ffe0 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,7 +13,6 @@
 //= require sidebar
 //= require richtext
 //= require resize
 //= require sidebar
 //= require richtext
 //= require resize

-//= require notes

 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));
 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));