Merge fix

Signed-off-by: Justin Yost <[email protected]>
loadsys · Feb 18, 2014 · cf1fc59 · cf1fc59
1 parent 489c83a
commit cf1fc59
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ A CakePHP Plugin for adding automatic XML and HTML Sitemaps to an CakePHP applic
 
 ### Composer ###
 
-<<<<<<< Updated upstream
 Ensure `require` is present in `composer.json`. This will install the plugin into `Plugin/Sitemap`:
 
 ```