From 2a4e95fb5009756fc3c2c5a7d232ef4e71406cf0 Mon Sep 17 00:00:00 2001 From: Wade Alcorn Date: Fri, 13 Jan 2012 14:06:12 +1000 Subject: [PATCH] Attempted git confict fix --- rakefile => tmpRakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename rakefile => tmpRakefile (99%) diff --git a/rakefile b/tmpRakefile similarity index 99% rename from rakefile rename to tmpRakefile index ce45d3cd0..ef993614f 100644 --- a/rakefile +++ b/tmpRakefile @@ -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