From: Matt Amos Date: Tue, 13 Oct 2009 14:36:15 +0000 (+0000) Subject: Fixed merge fail - this branch doesn't have javascript_strings. X-Git-Tag: live~6506^2~8 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2a7f689f1fdc4e24717a91ece1894e1401cae670?hp=42cdcce858e38418403aa4733837da4c3a62ff34 Fixed merge fail - this branch doesn't have javascript_strings. --- diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index d1983a9f0..f072544aa 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -2,7 +2,6 @@ - <%= javascript_strings %> <%= javascript_include_tag 'prototype' %> <%= javascript_include_tag 'site' %>