sunflower 0.5.8 → 0.5.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/README +1 -1
  2. data/lib/sunflower/core.rb +2 -2
  3. metadata +1 -1
data/README CHANGED
@@ -1,4 +1,4 @@
1
- Version: 0.5.8 alpha
1
+ Version: 0.5.9 alpha
2
2
 
3
3
  >>> English:
4
4
 
@@ -40,7 +40,7 @@ end
40
40
  #
41
41
  # You can use multiple Sunflowers at once, to work on multiple wikis.
42
42
  class Sunflower
43
- VERSION = '0.5.8'
43
+ VERSION = '0.5.9'
44
44
 
45
45
  INVALID_CHARS = %w(# < > [ ] | { })
46
46
  INVALID_CHARS_REGEX = Regexp.union *INVALID_CHARS
@@ -260,7 +260,7 @@ class Sunflower
260
260
  # merge
261
261
  merged = out[0]
262
262
  out.drop(1).each do |cur|
263
- merged.recursive_merge! cur
263
+ merged.sunflower_recursive_merge! cur
264
264
  end
265
265
 
266
266
  return merged
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sunflower
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.8
4
+ version: 0.5.9
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: