Removed merge marker from README.

hoverlover · hoverlover · commit 1a0986e69cf6 · 2011-06-13T14:10:52.000-05:00
diff --git a/README.rdoc b/README.rdoc
@@ -307,7 +307,6 @@ Customizing the CSV format is as simple as customizing the index page.
     column :name
     column("Author") { |post| post.author.full_name }
   end
->>>>>>> master
 
 == Customizing the Form
 
