Download as
Browse Code »

Commit 73b551a3d2b770a95139955c54fd5118b6c0d6b8

Authored by Antonio Terceiro
1 parent 5bbb7305
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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