From 123d2b318f18b6115ff1225dd9017add51c7f234 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 28 Oct 2012 07:12:23 +0000
Subject: fix scm_iconv local variable name (#12228)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10741 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/redmine/scm')

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index c15965595..28f5f16f8 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -264,7 +264,7 @@ module Redmine
             str.force_encoding(from)
             begin
               s = str.encode(to)
-            rescue Exception => e
+            rescue Exception => err
               logger.error("failed to convert from #{from} to #{to}. #{err}")
               nil
             end
-- 
cgit v1.2.3