Permalink
Browse files

fix merging bug

  • Loading branch information...
1 parent 7e29c96 commit db8e72e49200651cc9a383b8187e5ec9c6d28baf @marshally committed May 16, 2012
Showing with 0 additions and 3 deletions.
  1. +0 −3 lib/rspec/rails/uncommitted/tasks/rspec.rake
@@ -67,13 +67,10 @@ namespace :spec do
RSpec::Core::RakeTask.new(:unmerged => spec_prereq) do |t|
t.pattern = specs_to_run unmerged
end
-<<<<<<< HEAD
desc "Run unpushed specs"
RSpec::Core::RakeTask.new(:unpushed => spec_prereq) do |t|
t.pattern = specs_to_run unpushed
end
-=======
->>>>>>> c47c1eedbfd3c35132c981d390573077dacde7d5
end

0 comments on commit db8e72e

Please sign in to comment.