Browse files

Merge branch 'master' of github.com:lassebunk/gretel

  • Loading branch information...
2 parents 898879e + 9e71337 commit 81a2a7c7e5a00fb8d28faf58b91ffeabe6526fcf @lassebunk committed Jan 6, 2012
Showing with 0 additions and 3 deletions.
  1. +0 −3 README.rdoc
View
3 README.rdoc
@@ -25,11 +25,8 @@ In <code>config/initializers/breadcrumbs.rb</code>:
end
crumb :projects do
-<<<<<<< HEAD
link "Projects", projects_path, :class => "breadcrumb", :style => "font-weight: bold;"
-=======
link "Projects", projects_path, { :class => 'breadcrumb', :style => 'font-weight: bold;' }
->>>>>>> parent of ef73699... beauty without brackets :-)
end
crumb :project do |project|

0 comments on commit 81a2a7c

Please sign in to comment.