Merge branch 'mailer' of [email protected]:djcp/cohort

Conflicts: .gitignore
djcp · Nov 18, 2009 · fa7886d · fa7886d
2 parents 511365b + d239e6a
commit fa7886d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/test/functional/contact_cart_controller_test.rb~d239e6a3da46948c41b7f7deeda556d9b18e81c7 b/test/functional/contact_cart_controller_test.rb~d239e6a3da46948c41b7f7deeda556d9b18e81c7
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class ContactCartControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end
diff --git a/test/unit/contact_cart_test.rb~d239e6a3da46948c41b7f7deeda556d9b18e81c7 b/test/unit/contact_cart_test.rb~d239e6a3da46948c41b7f7deeda556d9b18e81c7
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class ContactCartTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end