Download as
Browse Code »

Commit 73b551a3d2b770a95139955c54fd5118b6c0d6b8

Authored by Antonio Terceiro
1 parent 5bbb7305
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix broken merge

Showing 1 changed file with 0 additions and 1 deletions   Show diff stats
test/unit/article_block_test.rb
  Diff comments   View file @73b551a
@@ -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