diff options
| author | mr <mr@mrautenberg.de> | 2011-08-04 18:40:44 +0200 |
|---|---|---|
| committer | mr <mr@mrautenberg.de> | 2011-08-04 18:40:44 +0200 |
| commit | 53ed9cb9ec537cc342079ca03f956d3541a11726 (patch) | |
| tree | c8ea67c6cb9f6ce5d5ef0fed1264121a1bab0651 /lib/merge.rb | |
| parent | 68f0e8a9b4ab9c6eda1da21423bda0186cfd01c6 (diff) | |
| parent | 9ca1bfaecbbe8b2941cdc6cd8a907448b17eeb85 (diff) | |
Merge branch 'release/v2.1.0'
Diffstat (limited to 'lib/merge.rb')
| -rw-r--r-- | lib/merge.rb | 2 |
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 |