mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-15 20:50:05 +00:00
cleaning
This commit is contained in:
@@ -1709,11 +1709,13 @@ class CfgYaml:
|
|||||||
if k not in final:
|
if k not in final:
|
||||||
final[k] = []
|
final[k] = []
|
||||||
final[k] += val
|
final[k] += val
|
||||||
|
elif isinstance(val, str):
|
||||||
|
final[k] = val
|
||||||
else:
|
else:
|
||||||
# don't know how to handle
|
# don't know how to handle
|
||||||
# err = 'unable to merge'
|
err = 'unable to merge'
|
||||||
# raise YamlException(err)
|
raise YamlException(err)
|
||||||
final[k] = val
|
|
||||||
return final
|
return final
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
Reference in New Issue
Block a user