Permalink
Browse files

Fixing merge

  • Loading branch information...
1 parent 6bdf054 commit 6f34f9d4f401815519301c1963cfd445ef3046b4 @winton committed Jan 2, 2011
Showing with 1 addition and 6 deletions.
  1. +1 −6 Rakefile
View
@@ -64,15 +64,10 @@ task :gemspec do
gemspec.validate
end
-<<<<<<< HEAD
-task :package => :gemspec
-task :default => :spec
-=======
desc "Install gem locally"
task :install => :package do
sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
end
task :default => :spec
-task :package => :gemspec
->>>>>>> bafdf8353a6838ac0e9fc75395de82a96b8c8f3e
+task :package => :gemspec

0 comments on commit 6f34f9d

Please sign in to comment.