0
@@ -66,13 +66,8 @@ end
0
 
0
 desc "Publish the beta gem"
0
 task :pgem => [:package] do
0
-<<<<<<< HEAD:activesupport/Rakefile
0
-  Rake::SshFilePublisher.new("wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
0
-  `ssh wrath.rubyonrails.org './gemupdate.sh'`
0
-=======
0
   Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
0
   `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
0
->>>>>>> e8bf065... Use personal server as temporary gem testing site until wrath get its shit together:activesupport/Rakefile
0
 end
0
 
0
 desc "Publish the API documentation"