summaryrefslogtreecommitdiff
path: root/lib/merge.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/merge.rb')
-rw-r--r--lib/merge.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/merge.rb b/lib/merge.rb
index ecbe133..f30a3c1 100644
--- a/lib/merge.rb
+++ b/lib/merge.rb
@@ -126,7 +126,7 @@ module Lib
if value1==nil && value2==nil
value = nil
elsif value1.to_s != value2.to_s
- value = value1.to_s + "/" + value2.to_s
+ value = value1.to_s + ";" + value2.to_s
else
value = value2.to_s
end