From cf1fc59ef736026a401713770d72c4b4ed8c0d03 Mon Sep 17 00:00:00 2001 From: Justin Yost Date: Tue, 18 Feb 2014 09:46:04 -0800 Subject: [PATCH] Merge fix Signed-off-by: Justin Yost --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0b690c9..9a3f93c 100644 --- 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`: ```