Commit 73b551a3d2b770a95139955c54fd5118b6c0d6b8

Authored by Antonio Terceiro
1 parent 5bbb7305

Fix broken merge

Showing 1 changed file with 0 additions and 1 deletions   Show diff stats
test/unit/article_block_test.rb
@@ -51,7 +51,6 @@ class ArticleBlockTest < Test::Unit::TestCase @@ -51,7 +51,6 @@ class ArticleBlockTest < Test::Unit::TestCase
51 assert_nil block.article_id 51 assert_nil block.article_id
52 end 52 end
53 53
54 -<<<<<<< HEAD  
55 should "take available articles with a person as the box owner" do 54 should "take available articles with a person as the box owner" do
56 person = create_user('testuser').person 55 person = create_user('testuser').person
57 person.articles.delete_all 56 person.articles.delete_all