Commit
9128b0ff1080d5a10979994bd8d5dcbf1a33b9b2
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
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 |
