Download as
Browse Code »

Commit 30dbf4d769b552bf6eb8e3b2f597c2199f6fdf6f

Authored by Antonio Terceiro
1 parent 9c0082e5
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

ActionItem937: fixing bad merge

Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
public/stylesheets/common.css
  Diff comments   View file @30dbf4d
@@ -481,8 +481,7 @@ div.pending-tasks { @@ -481,8 +481,7 @@ div.pending-tasks {
481 481
482 #wizard-content h1 { 482 #wizard-content h1 {
483 font-size: 22px; 483 font-size: 22px;
484 -=======  
485 - 484 +}
486 485
487 #portal-news { 486 #portal-news {
488 font-size: 11px; 487 font-size: 11px;