Commit
9128b0ff1080d5a10979994bd8d5dcbf1a33b9b2
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
Fixing merge mistake
|
| @@ -38,11 +38,7 @@ class Noosfero::Plugin::Settings |
| @@ -38,11 +38,7 @@ class Noosfero::Plugin::Settings |
|
38
| end |
38
| end |
|
39
| |
39
| |
|
40
| def save! |
40
| def save! |
|
41
| -<<<<<<< HEAD |
| |
|
42
| - @environment.save! |
| |
|
43
| -======= |
| |
|
44
| @base.save! |
41
| @base.save! |
|
45
| ->>>>>>> merge-requests/248 |
| |
|
46
| end |
42
| end |
|
47
| |
43
| |
|
48
| end |
44
| end |
