Download as
Browse Code »

Commit 30dbf4d769b552bf6eb8e3b2f597c2199f6fdf6f

Authored by Antonio Terceiro
1 parent 9c0082e5
Exists in staging and in 26 other branches angular_poc, api-article-archived, api-homepage, api_visitor, article-readonly, caching-rails4, captcha_serpro_plugin, comment_paragraph_api, comments_api_reply, content-manager-hostspot, environment-api, export-comment-paragraph, fix_event_date_issue, fix_multitenancy, fix_profile_wall, fix_string_downcase_and_upcase, fix_upload_files_on_development_environment, json_cookie_serializer, login-captcha, master, new_security, new_video_plugin, pg_search_rank, production, resend_confirmation_email, tasks_keep_filter_params

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;