Permalink
Browse files

fix up merge

  • Loading branch information...
marshally committed May 15, 2012
1 parent 3650ec6 commit e1f88df9a4e14227f554a7814272193af785d5c7
Showing with 0 additions and 4 deletions.
  1. +0 −4 lib/rspec/rails/uncommitted/tasks/rspec.rake
@@ -36,7 +36,6 @@ def unmerged(branch="master")
end
end
-<<<<<<< HEAD
def current_branch
git_status[/On branch ([^\s]+)/, 1]
end
@@ -46,9 +45,6 @@ def git_status
end
def specs_to_run(changed)
-=======
-def specs_to_run
->>>>>>> c47c1eedbfd3c35132c981d390573077dacde7d5
# cribbed from rails/railties/lib/rails/test_unit/testing.rake
models = changed.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
controllers = changed.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }

0 comments on commit e1f88df

Please sign in to comment.