From 9128b0ff1080d5a10979994bd8d5dcbf1a33b9b2 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Mon, 3 Dec 2012 16:53:49 +0000 Subject: [PATCH] Fixing merge mistake --- lib/noosfero/plugin/settings.rb | 4 ---- 1 file changed, 0 insertions(+), 4 deletions(-) diff --git a/lib/noosfero/plugin/settings.rb b/lib/noosfero/plugin/settings.rb index 81b8d6b..ab6f8e7 100644 --- a/lib/noosfero/plugin/settings.rb +++ b/lib/noosfero/plugin/settings.rb @@ -38,11 +38,7 @@ class Noosfero::Plugin::Settings end def save! -<<<<<<< HEAD - @environment.save! -======= @base.save! ->>>>>>> merge-requests/248 end end -- libgit2 0.21.2