gistfile1.txt

--- a/config/deploy.rb
+++ b/config/deploy.rb
@@@ -21,7 -21,11 +21,15 @@@ set :shared_files, %w(
  
  set  :keep_releases,  3
  namespace :deploy do
++<<<<<<< HEAD
 +    task :stop_apache, :roles => :web, :on_no_matching_servers => :continue do
++=======
+     task :permissions do
+         sudo "chown -R www-data:www-data #{deploy_to}"
+     end
+ 
+     task :stop_apache, :roles => :web do
++>>>>>>> 73d03bbb05e61b8585b8fcc7b99d45bee11677cf
          sudo "/etc/init.d/apache2 stop"
      end
  
--------------------------------accepted--------------------------
    task :permissions, :on_no_matching_servers => :continue do
        sudo "chown -R www-data:www-data #{deploy_to}"
    end

    task :stop_apache, :roles => :web, :on_no_matching_servers => :continue do
        sudo "/etc/init.d/apache2 stop"
    end