twitter-bootstrap-form-builder 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -107,7 +107,7 @@ module MNE
107
107
  if opts.keys.include?(key)
108
108
  sub_opts = opts.delete(key)
109
109
 
110
- return [sub_opts.merge(defaults)] if sub_opts.is_a? Hash
110
+ return [defaults.merge(sub_opts)] if sub_opts.is_a? Hash
111
111
  return [sub_opts, defaults] if sub_opts.is_a? String
112
112
 
113
113
  # If we were explicitly given an array, we're done.
@@ -1,5 +1,5 @@
1
1
  module MNE
2
2
  module TwitterBootstrapFormBuilder
3
- VERSION = "0.0.5"
3
+ VERSION = "0.0.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 5
9
- version: 0.0.5
8
+ - 6
9
+ version: 0.0.6
10
10
  platform: ruby
11
11
  authors:
12
12
  - Matthew Eagar