Commit
30dbf4d769b552bf6eb8e3b2f597c2199f6fdf6f
Exists in
master
and in
22 other branches
angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis
ActionItem937: fixing bad merge
| @@ -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; |