]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42cdcce)
Fixed merge fail - this branch doesn't have javascript_strings.
authorMatt Amos <zerebubuth@gmail.com>
Tue, 13 Oct 2009 14:36:15 +0000 (14:36 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Tue, 13 Oct 2009 14:36:15 +0000 (14:36 +0000)
app/views/layouts/site.html.erb patch | blob | history

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index d1983a9f0ba2e4cb72c62517bfe7406fd5b9b9a1..f072544aa21367fdbbbb0d55c41dc5998baadd4c 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -2,7 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
   <head>
     <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
   <head>
     <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
-    <%= javascript_strings %>
     <%= javascript_include_tag 'prototype' %>
     <%= javascript_include_tag 'site' %>
     <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
     <%= javascript_include_tag 'prototype' %>
     <%= javascript_include_tag 'site' %>
     <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
The OpenStreetMap web site