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