From 2a7f689f1fdc4e24717a91ece1894e1401cae670 Mon Sep 17 00:00:00 2001 From: Matt Amos Date: Tue, 13 Oct 2009 14:36:15 +0000 Subject: [PATCH] Fixed merge fail - this branch doesn't have javascript_strings. --- app/views/layouts/site.html.erb | 1 - 1 file changed, 1 deletion(-) 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' %> -- 2.43.2