Browse Source

fix: allow merging ``float`` values also.

hostresources
Valentin Lab 6 years ago
parent
commit
32a0145e6e
  1. 2
      bin/compose-core

2
bin/compose-core

@ -216,7 +216,7 @@ def merge(*args):
return None
if len(args) == 1:
return args[0]
if all(isinstance(arg, (int, basestring, bool)) for arg in args):
if all(isinstance(arg, (int, basestring, bool, float)) for arg in args):
return args[-1]
elif all(isinstance(arg, list) for arg in args):
res = []

Loading…
Cancel
Save