Skip to content
Browse files

Forgot to resolve one file

  • Loading branch information...
1 parent 02d610b commit d4eb3c0b7d13d3898c14d6ea7bfbc1853394f4e8 @dhh dhh committed Sep 4, 2008
Showing with 0 additions and 5 deletions.
  1. +0 −5 activesupport/Rakefile
View
5 activesupport/Rakefile
@@ -66,13 +66,8 @@ end
desc "Publish the beta gem"
task :pgem => [:package] do
-<<<<<<< HEAD:activesupport/Rakefile
- Rake::SshFilePublisher.new("wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
- `ssh wrath.rubyonrails.org './gemupdate.sh'`
-=======
Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
`ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
->>>>>>> e8bf065... Use personal server as temporary gem testing site until wrath get its shit together:activesupport/Rakefile
end
desc "Publish the API documentation"

0 comments on commit d4eb3c0

Please sign in to comment.
Something went wrong with that request. Please try again.