Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merged rakefile. even thought it was identical

  • Loading branch information...
commit 6ffea94ea480fc0d6c9970df6cb92ead55bb0ced 1 parent 6a33f1f
@idyll idyll authored
Showing with 0 additions and 4 deletions.
  1. +0 −4 Rakefile
View
4 Rakefile
@@ -7,8 +7,4 @@ desc 'Default: run specs.'
task :default => :spec
desc "Run specs"
-<<<<<<< HEAD
RSpec::Core::RakeTask.new
-=======
-RSpec::Core::RakeTask.new
->>>>>>> a6f198accd95ec0771f298edfc4224337e3b7992
Please sign in to comment.
Something went wrong with that request. Please try again.