Rakefile in SparseMatrixProject-0.0.2 vs Rakefile in SparseMatrixProject-0.0.3

@@ -8,7 +8,11 @@
 task :default => :spec
 
 desc "Run UniTest Matrices"
 task :test do
    sh "ruby -Ilib -Itest test/tc_Matrices.rb"
+<<<<<<< HEAD
 end
 
+=======
+end
+>>>>>>> 74a54b5fee97668eefe84bad85ac0e0a70ac726c