Merge globals.js.erb and params.js

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 91354073068c7a321bc4d184a7e0162b754563ed..785862ccc47391473dced0ddc6fa47c5e82a9a56 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -6,8 +6,7 @@
 //= require augment
 //= require openlayers
 //= require i18n/translations
-//= require globals
-//= require params
+//= require osm
 //= require piwik
 //= require map
 //= require menu