From 73b551a3d2b770a95139955c54fd5118b6c0d6b8 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 8 May 2010 17:09:28 -0300 Subject: [PATCH] Fix broken merge --- test/unit/article_block_test.rb | 1 - 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/test/unit/article_block_test.rb b/test/unit/article_block_test.rb index 2fa2c16..7547c92 100644 --- a/test/unit/article_block_test.rb +++ b/test/unit/article_block_test.rb @@ -51,7 +51,6 @@ class ArticleBlockTest < Test::Unit::TestCase assert_nil block.article_id end -<<<<<<< HEAD should "take available articles with a person as the box owner" do person = create_user('testuser').person person.articles.delete_all -- libgit2 0.21.2