Commit
9128b0ff1080d5a10979994bd8d5dcbf1a33b9b2
Exists in
master
and in
28 other branches
1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies
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 |
