Attempted git confict fix

2012-01-13 14:06:12 +10:00
parent 3d37e99fc0
commit 2a4e95fb50
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -21,7 +21,7 @@ task :quick do
  Rake::Task['unit'].invoke
 end

-desc "Run all unit tests"
+desc "Run all tests"
 task :all do
  Rake::Task['integration'].invoke          # run integration tests
  Rake::Task['unit'].invoke                 # run unit tests