fixing conflicts

2015-07-27 23:29:32 +02:00
parent 137267887c 99481722ce
commit cc3f151914
18 changed files with 115 additions and 23 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,16 +5,16 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />

        <title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
-
        <%= stylesheet_link_tag    "application" %>
        <%= javascript_include_tag "vendor/modernizr" %>
        <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
        <%= csrf_meta_tags %>
+        <script src="https://www.google.com/recaptcha/api.js?hl=<%= I18n.locale %>"></script>
    </head>
-<body>
-    
+  <body>
+
    <%= render 'layouts/header' %>
-    
+
    <% if notice %>
        <p class="alert-box success"><%= notice %></p>
    <% end %>
@@ -22,11 +22,11 @@
    <% if alert %>
        <p class="alert-box success"><%= alert %></p>
    <% end %>
-    
+
    <div class="row">
      <div class="small-12 column">
        <%= yield %>
      </div>
-    </div>  
-</body>
+    </div>
+  </body>
 </html>