rmeoved conflicts

2014-02-22 23:22:24 -05:00 · 2014-02-22 23:22:24 -05:00 · 669763b878
parent 4e46a4e3e7
commit 669763b878
1 changed files with 0 additions and 4 deletions
--- 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