merge conflict

dblaichinger · Jan 25, 2011 · f0b735c · f0b735c
1 parent 736dd55
commit f0b735c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
@@ -31,7 +31,8 @@
     </div>
     <p class="signup">New user? <%= link_to "Sign up for free!", signup_path %></p>
   <% end %>
-<% end %>        
+<% end %>   
+