Permalink
Browse files

Merged

  • Loading branch information...
2 parents c5fac45 + 7494d77 commit cf7ac4a41d3c738a562fa3db97236a00ac4e617f @bartzon bartzon committed Apr 10, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 app/views/layouts/application.html.erb
@@ -30,7 +30,10 @@
<%= yield %>
</div>
+<<<<<<< HEAD
+=======
+>>>>>>> 7494d77d638a862324a06ff7bbe673cfafd11fa7
</div>
</body>

0 comments on commit cf7ac4a

Please sign in to comment.