From 669763b8788e85ed4853daacdbe50618c7cd7ca6 Mon Sep 17 00:00:00 2001
From: Derek Watson <watson@dcw.ca>
Date: Sat, 22 Feb 2014 23:22:24 -0500
Subject: [PATCH] rmeoved conflicts

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 0e2611c..24be975 100644
--- a/README.md
+++ b/README.md
@@ -111,11 +111,7 @@ end
 
 ### Multiple Environments
 
-<<<<<<< HEAD
 Deploy your site to more than one configuration using environment variables.
-=======
-Deploy to different environments using environment variables and Rake tasks.
->>>>>>> 260665eef9aa105ebd6521f300cbdc059e063a82
 
 ```ruby
 # config.rb