Fixed merge fail - this branch doesn't have javascript_strings.
This commit is contained in:
parent
42cdcce858
commit
2a7f689f1f
1 changed files with 0 additions and 1 deletions
|
@ -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"/>
|
||||
<%= javascript_strings %>
|
||||
<%= javascript_include_tag 'prototype' %>
|
||||
<%= javascript_include_tag 'site' %>
|
||||
<!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue