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

lassebunk · Jan 6, 2012 · 81a2a7c · 81a2a7c
2 parents 898879e + 9e71337
commit 81a2a7c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.rdoc b/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|