Download as
Browse Code »

Commit 9128b0ff1080d5a10979994bd8d5dcbf1a33b9b2

Authored by Rodrigo Souto
1 parent 53d8ceb4
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

Fixing merge mistake

Showing 1 changed file with 0 additions and 4 deletions   Show diff stats
lib/noosfero/plugin/settings.rb
  Diff comments   View file @9128b0f
@@ -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